summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-21Remove some unneeded printfsJared Adams3-7/+0
2010-05-21Fix transparent overlays under OpenGLJared Adams1-0/+4
This was accidentally broken in the SDL buffer commit. Reviewed-by: Thorbjørn Lindeijer
2010-05-21Fix compilationJared Adams1-1/+2
2010-05-21Merge branch '1.0'Thorbjørn Lindeijer48-149/+628
Conflicts: src/beingmanager.cpp src/beingmanager.h src/client.cpp src/localplayer.cpp
2010-05-21Fix a crash dealing with rescaled overlays under SDLJared Adams1-0/+1
Reviewed-by: Philipp Sehmisch
2010-05-21Fix some issues found by CppcheckJared Adams5-14/+22
2010-05-21Merge protocol from manaserv about thing types.Yohann Ferreira2-8/+15
Reviewed-by: Jaxad0127 (A few days ago...)
2010-05-21Fix handling sprite alphaJared Adams1-2/+1
This way, it's only set to the overlay alpha while drawing the overlay. Fixes PlayerBox rendering.
2010-05-21Avoid a crash when the updateHost is set to nothing in the config file.Yohann Ferreira1-2/+2
Reviewed-by: Jaxad0127
2010-05-21Fix some memory leaks in SDL layerd sprite bufferingJared Adams1-0/+9
2010-05-20Buffer layered sprites under SDLJared Adams10-69/+320
This improves framerate and allows transparent overlay for complex sprites. Two copies of the buffer are kept, one at full opacity, one with variable opactiy, to reduce calls to setAlpha. Reviewed-by: Bertram
2010-05-17Add support for different target cursor sizes for NPCsJared Adams4-24/+28
Moves the parsing logic for the size strings into BeingInfo to share the code. Reviewed-by: Freeyorp
2010-05-17Remove Monster, Player, and NPC classesJared Adams76-1641/+1135
Instead of having these three subclasses with minor differences, this commit merges them back into Being. In the future, we can make Beings that are talkable to some, attackable by others, etc. This also puts back support for monster equipment. Also changes remaining references to Being::Type and the constants to refer to ActorSprite::Type. Reviewed-by: Freeyorp
2010-05-13Fix added images to automake.Andrei Karas1-5/+9
2010-05-13Draw item image in item popups.Andrei Karas4-11/+55
Now draw image only in chat item popup. Reviewed-by: Bertram
2010-05-09Move target cursor management into ActorSpriteJared Adams16-96/+187
This simplifies handling of target cursors, centralizing their logic into a single class, instead of two. Also make them more flexible and move the image files outside of the theme so servers can can control them and give them better names. Reviewed-by: Thorbjørn Lindeijer
2010-05-06Add support for floor item spritesJared Adams46-720/+1158
This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite; CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common functionailty into new base classes which will make other Mantis tickets easier to do. Also allows monsters to use particle effects. Reviewed-by: Bertram
2010-05-06Fix reading arrays at index -1.Andrei Karas2-3/+12
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-05-06Add missing colors.xml to CMakefiles.txt.Hong Hao1-0/+1
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-05-06Remove hardcoded standard server urlsseeseekey1-5/+3
Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2010-05-06Make the logic for collision tiles more strictThorbjørn Lindeijer1-1/+1
Only recognize the collision tile as colliding, since having everything except the empty non-collision tile collide is confusing. Should also be changed on the server and in the tmwAthena exporter of Tiled. Reviewed-by: Dennis Friis
2010-05-06Fixed some copy/pasted documentationThorbjørn Lindeijer1-3/+3
2010-05-05Fix showing the type of the default serverJared Adams2-1/+3
Reviewed-by: Thorbjørn Lindeijer
2010-05-05Allow start game if update server is down.Andrei Karas1-9/+23
Small code style changes. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-05-04Clear NPC dialogs when the player diesJared Adams6-0/+24
Reviewed-by: Freeyorp
2010-05-04Fix mouse attack (tmwa)Andrei Karas1-4/+2
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2010-05-03synchronised protocol.h between manaserv, mana and manamobileMaximilian Philipps3-29/+79
2010-05-02Fix cmake builds for OS XBernd Wachter1-0/+2
2010-05-02Add some basic CPack stuffBernd Wachter1-0/+17
2010-05-01Add chat logging.Andrei Karas20-1/+335
Add option in players setup page. Add command line option. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-04-25Fix resource errors when chaning serversJared Adams2-8/+10
Reviewed-by: Freeyorp
2010-04-25Fix some button issues in SocialWindowJared Adams2-2/+21
The invite and leave buttons are now only enabled when there are tabs. Also, the code to handle them will do nothing if no tab is selected (backup logic). Reviewed-by: Chuck Miller
2010-04-25Make ManaServ player stats softcodedJared Adams10-39/+280
A new stats.xml file is parsed for player stats for ManaServ. The old hardcoded stats remain as backup. Reviewed-by: Bertram
2010-04-25Fix some storage bugsJared Adams2-15/+17
Reviewed-by: Bertram
2010-04-25Fixed the VideoMode listBox logic in the setup window.Bertram1-0/+34
Reviewed by: Jaxad0127
2010-04-23Add an Actor class to replace the Sprite classJared Adams17-358/+317
The Actor class manages the Map reference, position vector, and alpha float. These are the common parts from it's children.
2010-04-23Fixed remoitnane mentioned as "No Name" in the shortlogThorbjørn Lindeijer1-0/+1
2010-04-22Fix keyboard target selection to allow player targetingNo Name2-7/+11
Modifies BeingManager::findNearestLivingBeing() behaviour to exclude an optional being from the search. Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-04-23Add documentation for the /away command.Bertram1-5/+21
Reviewed by Jaxad0127
2010-04-21Add a clear button to the NPC dialogJared Adams4-16/+73
Reviewed-by: Bertram
2010-04-19Add afk mode for player.Andrei Karas8-1/+115
Add variable cur_time for current time. Add command /away [text] Reviewed by: Bertram
2010-04-19Fix two skill failed constantsJared Adams1-2/+2
See tmwAthena's skill.c lines 7628 and 7633. Reviewed-by: Chuck Miller
2010-04-17Changed an EATHENA remaining reference to TMWATHENA.Bertram1-1/+1
Latest two patches reviewed by Jaxad0127.
2010-04-17Changed eAthena protocol name to TmwAthena and changed the config files ↵Bertram60-493/+496
accordingly. This makes room for the actual eAthena protocol future inclusion.
2010-04-16Remove an unneeded monster job offset in eAthena netcodeJared Adams2-8/+4
2010-04-16Fix canceling game connectionJared Adams8-14/+46
Reviewed-by: Bertram
2010-04-16Add race support for eAthenaJared Adams15-84/+129
The job/class field is used to select the race. If the given race isn't defined, it falls back on the first race (so servers can use jobs/classes without races). Also rename job to subtype for Being and subclasses, and begin support for changing monster and NPC subtypes on the fly (particle effects still need to be reset when they change). Reviewed-by: Bertram
2010-04-12Fix error in server list download when download has problemsJared Adams1-2/+5
2010-04-12Fix canceling game connect leaving no characters to selectJared Adams1-1/+1
2010-04-12Completely ignore eAthena job 45Jared Adams2-3/+9
These are warps. Reviewed-by: Bertram