summaryrefslogtreecommitdiff
path: root/data
AgeCommit message (Collapse)AuthorFilesLines
2009-04-28Removed loginWallpaper from example branding.xml (no longer supported)Philipp Sehmisch1-1/+0
2009-04-20Removed two unused gui resources.Tametomo4-4/+0
Signed-off-by: Tametomo <irarice@gmail.com> Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-04-14Cleanup of Sound class, fixing restoring of volumes and musicBjørn Lindeijer1-9/+8
While a previous commit fixed the restoring of music of the current map in the setup window, this commit makes sure that the Sound class itself will resume a previously playing song when it is re-initialized. Other fixes: * Restore the correct volumes when enabling sound * Play the right audio track during login * Specify which font to use for bold text
2009-04-06Fixed DATADIR and LOCALEDIR variables for CMake-build; fixed game data ↵Bernd Wachter2-2/+1
installation
2009-03-28Forgot to add the sticky button graphics to makeJared Adams1-0/+1
2009-03-28Add a sticky button to the Window classJared Adams1-0/+0
The Minimap window uses this so you can froce it to always be open. The Minimap toggle button can be used to show or hide it temporarily, as warping will reset it's visibility based on the sticky state and weather the 'new' map has a minimap.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer5-6/+0
Conflicts: A lot of files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer8-1/+30
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-26Merge branch 'aethyra/master'Bjørn Lindeijer5-6/+0
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-23Clean up of Aethyra logo on 800x600 wallpaper by Taz2781.Ira Rice1-0/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Removed the last of the image particle guichan fonts.Ira Rice5-6/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Fixed GUI opacity in SDL modeBjørn Lindeijer30-0/+0
By using indexed instead of alpha-layered images, the GUI opacity can also be supported in software mode.
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 Lindeijer1-1/+1
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-1/+1
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-15Merge branch '0.0.28'Bjørn Lindeijer2-16/+10
Conflicts: po/POTFILES.in src/main.cpp src/main.h tmw.cbp
2009-02-13Added in mac build support, contributed to us by allenmoatallen> fromIra Rice2-1/+1
Legends of Mazzeroth. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-12Some more files which got fixed up for release (basically versionIra Rice1-1/+1
bumps). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-12Updated version to 0.0.28.1Bjørn Lindeijer2-16/+10
Also updated NEWS file with changes since 0.0.28.
2009-02-11Removed speech_bubble.png also from build filesBjørn Lindeijer2-3/+1
2009-02-11Restored QOALs speech bubblePhilipp Sehmisch2-12/+12
2009-02-10Changed window background color back to TMW styleBjørn Lindeijer1-0/+0
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer24-21/+56
Conflicts: Almost everywhere.
2009-01-25Added new bubble graphic to installed filesBjørn Lindeijer2-0/+2
Fixes crash found by Hong Hao.
2009-01-24Removed a few files which aren't being used any more.Ira Rice7-10/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Updated DejaVuSans ttf file, as well as adding the bolded version, whichIra Rice4-1/+3
is used in a few spots. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Use standard GUI font also for speech and namesBjørn Lindeijer6-5/+0
The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names.
2009-01-24Version updated to 0.0.28Bjørn Lindeijer2-1/+9
To be released hopefully tomorrow.
2009-01-24Added speech bubble background by QOALBjørn Lindeijer1-0/+0
2009-01-16Candidate release for 0.0.27.1 (Windows needs to get colors fixed, andIra Rice2-1/+7
then this build might be official) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Merged Tab and TabbedArea from mainlineBjørn Lindeijer4-0/+4
Changes mostly done by David Athay. Currently these widgets are only used in the setup window, where they replace the previously used TabbedContainer.
2009-01-13Merged Tab and TabbedArea from mainlineBjørn Lindeijer4-0/+4
Changes mostly done by David Athay. Currently these widgets are only used in the setup window, where they replace the previously used TabbedContainer.
2009-01-10Changed a few emote variable names to be more sensible, as well asIra Rice2-1/+0
removing emotions.png from the client data files (should have never been there to begin with, IMO). TODO: Simplify the emote code so that there is a lot less redundant code, as well as make filling out the possible emotes more flexible. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05CMake warning fixes by RodericBjørn Lindeijer2-4/+1
(merged from mainline)
2009-01-05CMake warning fixes by RodericBjørn Lindeijer2-4/+1
(merged from mainline)
2009-01-05Removed two no longer used bitmap fontsBjørn Lindeijer4-4/+0
2009-01-05Fixed installing of dejavusans.ttf with CMakeBjørn Lindeijer2-0/+7
Merged from mainline, change by roderic
2009-01-04Fixed installing of dejavusans.ttf font.Bjørn Lindeijer2-1/+6
(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1) Conflicts: src/gui/gui.cpp
2008-12-29Removed a few now unnecessary data files.Ira Rice5-6/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice5-1/+15
class. NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to install it, regenerate your config files, reconfigure, and then install before attempting to compile. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Added support for True Type Fonts.Eugenio Favalli1-0/+0
(cherry-picked from mainline)
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-09Changed a few references to the SVN so that it uses www.aethyra.org instead ↵Victor Fury1-1/+1
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-09Updated release date for 0.0.27v0.0.27Bjørn Lindeijer2-2/+3
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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice6-0/+100
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-07Updated version to 0.0.27Bjørn Lindeijer2-25/+26
2008-12-07Some small updates and reformattingBjørn Lindeijer1-1/+1
2008-12-07Updated link to the forumsBjørn Lindeijer1-1/+1
Only a few years overdue? Conflicts: NEWS (cherry picked from eAthena branch)
2008-12-06Updated link to the forumsBjørn Lindeijer1-1/+1
Only a few years overdue?