summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-03-23Merge eA's command handling into CommandHandlerJared Adams10-627/+503
Also drop Aethyra's custom magic code
2009-03-22Move handling of eA skill messages to SkillHandlerJared Adams3-151/+132
2009-03-22Fix chat under eAthenaJared Adams3-79/+73
2009-03-22Fixed loading of units when skipping updatesBjørn Lindeijer1-2/+3
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer274-3569/+19796
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-02-18Introduced configure switch for tmwserv/eAthenaBjørn Lindeijer1-5/+37
Preparation for universal client.
2009-02-18Merge commit 'aethyra/master'Bjørn Lindeijer2-25/+21
Conflicts: src/net/npchandler.cpp
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer48-136/+147
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Centralize current_npc cleanupJared Adams9-21/+38
2009-02-17Fix small bug in character select dialogJared Adams1-1/+1
That check can probably be removed entirely, as it's inappropriate.
2009-02-17Fix segfault when canceling new character dialogJared Adams1-1/+1
2009-02-17Fixed an error reported by m0t1k4 which caused a segmentation fault onIra Rice2-25/+21
closing when displaying your own name is turned on. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-17Fixed closing for NPC dialogs.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-17Show money for initial character in char selectJared Adams1-0/+1
2009-02-17Fix small bug in character select dialogJared Adams1-1/+1
That check can probably be removed entirely, as it's inappropriate.
2009-02-17Fix segfault when canceling new character dialogJared Adams1-1/+1
2009-02-17Reduce NpcTextDialog to one actionJared Adams2-14/+29
This allows external classes (like game.cpp) to send actions to it without them having to know about it's internal state.
2009-02-17Got rid of const where it does not make much senseBjørn Lindeijer10-22/+22
It's not that useful to make variables that are passed by value const. In the declaration it is even completely ignored.
2009-02-17Merge branch 'aethyra/master'Bjørn Lindeijer7-27/+37
Conflicts: src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npcstringdialog.cpp src/net/npchandler.cpp src/npc.cpp
2009-02-16Moved location of trim checking, since it really should be done afterIra Rice1-6/+3
the recipient nickname is parsed out. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Trim whitespace from the beginning and end of whispers, as well asIra Rice1-0/+21
disallowing empty whispers and whispers to yourself, since both of those cases cause the server to report back stating that the player wasn't found (even if they are there, like yourself). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Moved target unsetting on NPCs and monsters to the being class. This isIra Rice3-9/+5
done to ensure that the client doesn't crash if the target dies and is removed from the map (since target drawing is based off of the specific target reporting its x and y coordinates). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Don't arbitrarily unset player target on NPC deletionBjørn Lindeijer3-16/+16
When an NPC got deleted it would reset the player target. I'm assuming what was meant was to reset the target when the deleted NPC was the target.
2009-02-16Fixed a nasty crash that was only visible from the @help command. If theIra Rice1-1/+3
line's string was empty after trimming, the client would crash when trying to get a substring. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Fixed up NPC dialogs to behave more like eAthena expects.Jared Adams7-18/+21
2009-02-16Fixed GUI opacity in SDL modeBjørn Lindeijer32-15/+10
By using indexed instead of alpha-layered images, the GUI opacity can also be supported in software mode.
2009-02-16Allow setting default values for NPC dialogsJared Adams5-1/+16
2009-02-16Allow default value for IntTextField to be changedJared Adams2-3/+28
Also check value and default value when range is changed
2009-02-16Don't arbitrarily unset player target on NPC deletionBjørn Lindeijer3-16/+16
When an NPC got deleted it would reset the player target. I'm assuming what was meant was to reset the target when the deleted NPC was the target.
2009-02-16read hairstyle and gender from the looks change methodRoderic Morris1-1/+9
2009-02-16Fix some compilation issuesJared Adams2-2/+2
2009-02-16Add next/close buttons for NPCsJared Adams7-14/+62
And keep the text dialog open for the whole transaction, logging user input and keep a full record of text from the NPC (for the current transaction only).
2009-02-16Fixed most of the GUI opacity in software modeBjørn Lindeijer7-0/+0
By using indexed instead of alpha-layered images, the GUI opacity can also be supported in software mode. Images where converting to indexed would mean a reduction in quality have been left out of the conversion for now.
2009-02-16Don't mention a release date yet for 0.0.29Bjørn Lindeijer2-2/+2
2009-02-15Allow pressing enter with focus in port fieldBjørn Lindeijer3-4/+5
Added action event id to port field of login dialog.
2009-02-15Fixed compiler warningsBjørn Lindeijer1-1/+1
Comparison between signed and unsigned integer expressions.
2009-02-15Merge branch 'aethyra/master'Bjørn Lindeijer9-69/+0
2009-02-15Don't make window name translatableBjørn Lindeijer11-11/+11
The window name is used in the configuration file, in contrast to the window title.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer39-88/+88
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Fixes some variable names to conform to naming conventionBjørn Lindeijer17-59/+48
Please do remember that member variables are prefixes with 'm', so that they are easily distinguishable.
2009-02-15Fixed compiler warningsBjørn Lindeijer5-12/+13
Comparison between signed and unsigned integer expressions.
2009-02-15Deleted some unneeded delete statements.Ira Rice9-69/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Renamed aethyraFile to configFile, which is a lot more descriptive ofIra Rice1-6/+6
what its actually used for. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Fixed header copyright notices.Ira Rice2-4/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Fix setting of home directory for OSXJared Adams1-3/+7
2009-02-15Add configurable units systemJared Adams17-38/+353
2009-02-15More copyright header fixesBjørn Lindeijer12-27/+26
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer63-527/+449
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-15Initial update of NEWS fileBjørn Lindeijer2-0/+17
Also added Victor Fury to .mailmap file since he was also known as Frictor.
2009-02-15Merge branch '0.0.28'Bjørn Lindeijer36-1380/+2121
Conflicts: po/POTFILES.in src/main.cpp src/main.h tmw.cbp