summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2008-12-09Defer re-adding of particles to next call to Being::logic() to avoid crashFate3-4/+19
2008-12-09Status particle effects: when looking up block IDs (effect IDs for otherFate4-7/+19
players), make sure to initialise if needed Status particle effects: properly delete particles after effect has worn off
2008-12-08Small maps used to scroll as well as big maps. Fixed.Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08An attempt to fix the crashes related to particlesBjørn Lindeijer1-2/+7
The player character is never deleted, and hence might have particles still active when the map changes. These particles are deleted on map change, but when the player character was moved, it was trying to mark these deleted particles for deletion, writing to unallocated memory. The marking for deletion by the player character now happens before the particles are deleted. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-08An attempt to fix the crashes related to particlesBjørn Lindeijer1-2/+7
The player character is never deleted, and hence might have particles still active when the map changes. These particles are deleted on map change, but when the player character was moved, it was trying to mark these deleted particles for deletion, writing to unallocated memory. The marking for deletion by the player character now happens before the particles are deleted. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-08Mostly code reformattingBjørn Lindeijer3-9/+14
2008-12-08Code reformattingBjørn Lindeijer12-198/+128
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Code reformattingBjørn Lindeijer13-298/+175
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer12-31/+20
Inspired by qDeleteAll() from Qt. Conflicts: ChangeLog src/beingmanager.cpp src/channelmanager.cpp src/gui/skill.cpp src/map.cpp src/resources/monsterinfo.cpp (cherry picked from mainline)
2008-12-08Fixed speech bubbles, which broke on the last merger.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Compacted the inventory window layout.Ira Rice2-22/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-07Fixed a few help files that got messed up a few commits ago.Ira Rice4-87/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Added some initialization and removed ChargeDialogIra Rice9-126/+13
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> Conflicts: src/Makefile.am src/game.cpp src/gui/chargedialog.cpp src/gui/chargedialog.h src/localplayer.cpp src/localplayer.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer9-20/+21
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Fixed the minimap name field so that it works for us again. Since IIra Rice1-6/+4
originally ported this from TMW's trunk, and they later changed their mind on the minimap name property, this was broken on our maps. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Made minimap visible by defaultBjørn Lindeijer1-0/+2
Also remember its visibility state.
2008-12-07Tweaked some configuration defaultsBjørn Lindeijer3-10/+10
Scrolling is now a bit less lazy and the scroll radius is 0. In my opinion this is a better default. Framerate limiter is now off by default, since it makes the game appear a bit choppy. It's basically only useful for laptops anyway, and not too hard to find.
2008-12-07Fixed a few files that apparently weren't updated.Ira Rice5-16/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice109-452/+7740
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Some code reformattingBjørn Lindeijer5-29/+23
2008-12-07Added some initialization and removed ChargeDialogBjørn Lindeijer9-130/+13
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Ignore files created during Windows buildBjørn Lindeijer1-0/+7
2008-12-07Updated Code::Blocks projectBjørn Lindeijer1-2/+4
2008-12-07Changed bug contact to developer mailing listBjørn Lindeijer1-1/+1
2008-12-07Updated version to 0.0.27Bjørn Lindeijer7-31/+32