summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-12-14Code reformatting to conform to line lengthBjørn Lindeijer1-41/+63
(cherry picked from mainline) Conflicts: src/game.cpp
2008-12-14Removed unnecessary c_str()Bjørn Lindeijer1-1/+1
2008-12-14Code reformatting to conform to line lengthBjørn Lindeijer1-39/+57
2008-12-14Obscure precise home directory name when making screenshotsFate1-4/+9
(cherry picked from commit 7d5c6124e9c9cf447286eaa58afe17adf6c1a81d)
2008-12-14Removed the unused NewSkillDialogBjørn Lindeijer5-271/+0
Won't be introduced based on eAthena anyway, I think even with tmwserv we have different plans now. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena branch, commit bab09df7a8347f39221b2a87487dcd128a686def) Conflicts: src/game.cpp
2008-12-14Make the window shortcuts configurableJared Adams3-10/+28
(cherry picked from commit 4f2749ab2782fdece3c098b1a52b69cb37eea9eb)
2008-12-14Code reformattingBjørn Lindeijer12-238/+144
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-) (cherry picked from eAthena branch, commit 68760426532b9ca4c6939d7a7b8faa1586ee82e0) Conflicts: src/being.cpp src/being.h src/gui/tabbedcontainer.cpp src/particle.cpp src/particle.h
2008-12-14Removed ChargeDialogBjørn Lindeijer6-120/+0
The ChargeDialog was removed. This class was long dead anyway. (cherry picked from eAthena client commit 719e2b02bc6833198d6af2d3c95de96ef95f876d) Conflicts: src/CMakeLists.txt src/Makefile.am src/game.cpp src/localplayer.cpp src/localplayer.h src/net/charserverhandler.cpp tmw.cbp Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-14Merge branch 'master' of git@gitorious.org:tmw/aethyraIra Rice12-20/+19
2008-12-14Passing vectors by referencePhilipp Sehmisch2-318/+317
2008-12-14Removed remaining DOS newlinesBjørn Lindeijer1-3/+3
2008-12-14Some systactical sugar for 864e33Philipp Sehmisch2-18/+9
2008-12-14Fixed some linebreaksPhilipp Sehmisch1-296/+296
2008-12-14Fixed follow-parent of nested and being-following particle emittersPhilipp Sehmisch6-45/+62
2008-12-14Passing vectors by referencePhilipp Sehmisch2-318/+318
2008-12-14Some systactical sugar for 864e33Philipp Sehmisch2-18/+9
2008-12-14Reverted an accidental change in Code::Blocks project file.Philipp Sehmisch1-1/+1
2008-12-14Fixed follow-parent of nested and being-following particle emittersPhilipp Sehmisch2-2/+1
2008-12-14Fixed follow-parent of nested and being-following particle emittersPhilipp Sehmisch6-41/+60
2008-12-13Code style reformattingBjørn Lindeijer12-226/+173
Got rid of "void" in functions that take no arguments and removed the newline after the return type of a method in many places.
2008-12-13Fixed confusion between username and characterBjørn Lindeijer1-20/+26
Passing --playername would set both the username as well as the name of the character to play with. Now --username sets the username while --character is used for choosing the character. Also made it so that the login dialog won't show up when username and password are passed from the command line, unless login fails.
2008-12-13Got rid of confusing --default parameterBjørn Lindeijer1-19/+6
It was only used to automatically choose the character. For choosing the character, --playername can be used.
2008-12-13Only require a restart to switch to full screen with OpenGL on Windows, sinceBjørn Lindeijer1-0/+11
it works fine in Linux without having to reinitialize the OpenGL state. Adapted change by kraant from Aethyra. (cherry picked from eAthena client)
2008-12-13Mantis #406 by jaxad0127David Athay4-14/+34
(cherry picked from eAthena client) Conflicts: src/monster.cpp src/resources/monsterinfo.h
2008-12-13Fixed crash when map layer has too many tiles.Bjørn Lindeijer1-1/+7
(cherry picked from eAthena client)
2008-12-13Included some documentation for the shortcut window by Vq.Bjørn Lindeijer2-0/+16
(cherry picked from eAthena client) Conflicts: ChangeLog
2008-12-13fixed some compilation problems reported by Jaxad, updated project file to ↵Philipp Sehmisch2-79/+33
new code::blocks format.
2008-12-13Fixed alignment (patch by Scraggy - Mantis #384) and spelling error.David Athay1-2/+2
(cherry picked from eAthena client)
2008-12-13Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer8-4/+163
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map. (patch by Fate) (cherry picked from eAthena client, the part about the levelup message doesn't apply, and we now seem to have a second "effect manager"...) Conflicts: ChangeLog src/being.cpp src/being.h src/engine.cpp src/engine.h src/gui/ministatus.cpp src/net/beinghandler.cpp src/net/playerhandler.cpp src/net/protocol.h
2008-12-13The "name" property of the map is now used as caption of the minimap window ↵Philipp Sehmisch1-11/+6
when it exists. (cherry picked from eAthena client, replacing 'mapname' property handling)
2008-12-13Make sure to initialize joystick enabled stateBjørn Lindeijer3-48/+31
Joystick enabled state could end up uninitialized on unsuccesfully trying to open a joystick. In addition, the enabled state wasn't actually used in the accessor methods for the joystick buttons.
2008-12-13Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-12-13Updated INSTALL file to mention gitBjørn Lindeijer1-5/+4
Also got rid of autogen.sh and instructed to use 'autoreconf -i' instead. Conflicts: INSTALL (cherry picked from eAthena client. autogen.sh was already done here)
2008-12-13Added ability to add equipment to the shurtcut barBjørn Lindeijer4-20/+24
Patch by Nikos, with some improvements. Conflicts: NEWS src/gui/itemcontainer.cpp src/itemshortcut.cpp (cherry picked from eAthena client, not functional here yet)
2008-12-13Added Fate to the authorsBjørn Lindeijer1-0/+1
Conflicts: AUTHORS (cherry picked from eAthena client)
2008-12-13Center large minimaps on playerBjørn Lindeijer1-20/+21
Based on a patch by QOAL. (cherry picked from eAthena client) Conflicts: src/gui/minimap.cpp
2008-12-13Fixed compile error with GCC 4.4 reported by Martin Michlmayr.Bjørn Lindeijer1-5/+1
(cherry picked from eAthena client) Conflicts: ChangeLog
2008-12-13Do not activate shortcuts if tradewindow is visible.Dennis Friis1-8/+12
Conflicts: ChangeLog src/game.cpp (cherry picked from eAthena client)
2008-12-13* Use hair.xml to determine hair colours (#514)Fate4-25/+108
* Auto-detect number of hair styles available (#514) Conflicts: ChangeLog src/being.cpp src/being.h src/gui/char_select.cpp (cherry picked from eAthena client)
2008-12-13Moved gender and hair style back to BeingBjørn Lindeijer4-33/+48
These properties should also apply to NPCs and possibly even monsters in the future.
2008-12-10Obscure precise home directory name when making screenshotsFate1-9/+14
2008-12-10Obscure precise home directory name when making screenshotsFate1-4/+9
2008-12-09Changed a few references to the SVN so that it uses www.aethyra.org instead ↵Victor Fury12-20/+19
of 209.168.213.109 Changed a few references to aethyra.com to the appropriate aethyra.org values. There's a few other minor changes that mostly just replace references to TMW that are not essential with Aethyra references.
2008-12-09Fixed two issues with the chat message parsingBjørn Lindeijer1-6/+17
Don't treat anything starting with "Welcome" as a server message, for example messages starting with a name that starts with "Welcome" shouldn't belong in that category. Put the nick in the right place for global announcements. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-09Make the window shortcuts configurableJared Adams4-18/+52
2008-12-09Updated release date for 0.0.27v0.0.27Bjørn Lindeijer5-6/+6
2008-12-09Fixed two issues with the chat message parsingBjørn Lindeijer1-7/+11
Don't treat anything starting with "Welcome" as a server message, for example messages starting with a name that starts with "Welcome" shouldn't belong in that category. Put the nick in the right place for global announcements. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-09Removed the unused NewSkillDialogBjørn Lindeijer5-271/+0
Won't be introduced based on eAthena anyway, I think even with tmwserv we have different plans now. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-09Make the window shortcuts configurableJared Adams3-10/+28
2008-12-09Only play status effect sound effects for localplayerFate2-2/+4
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-22 21:56:28 +0000