summaryrefslogtreecommitdiff
path: root/src/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2009-02-15Add configurable units systemJared Adams1-0/+2
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-2/+0
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-11Changed spelling from colour to color.Philipp Sehmisch1-4/+4
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+0
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+1
Conflicts: docs/FAQ.txt packaging/windows/make-translations.vbs src/Makefile.am src/gui/colour.cpp src/gui/colour.h src/gui/popupmenu.cpp src/gui/setup_colours.h src/main.cpp src/main.h src/resources/resourcemanager.cpp src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h
2009-02-10Changed spelling from colour to color.Philipp Sehmisch1-4/+4
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-4/+6
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Changed AETHYRA_DATADIR to PKG_DATADIR.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-7/+4
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-10/+10
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-15/+50
Conflicts: Almost everywhere.
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-1/+0
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Added missing files to CMakeLists.Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-27Removed the fairly useless buttonbox class, as well as removing theIra Rice1-4/+2
recorder's dependence upon it. This class should get a bit more work done to it to simplify it further, but right now, it preserves all of the same functionality. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-0/+2
clicking on add to chat to put the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2009-01-19Fixes to the NPC Integer input fieldIra Rice1-2/+2
Also don't set "The Mana World" to start with. Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774) Conflicts: src/game.cpp src/gui/inttextfield.cpp src/gui/item_amount.cpp src/gui/textfield.h
2009-01-18Fixed the NPC Integer input field, as well as cut some bull from theIra Rice1-2/+2
NPC String class. The Integer input field was rather horribly broken to the point where it could send invalid data, the increment and decrement buttons didn't work, and overall it was tripping over itself. As for the NPC String, "The Mana World" as a string is not needed to set the field to that length, but instead fills the text field with that text for starting. This is completely inappropriate for a text entry field, and a more sensible default would be to leave it empty, so that people can type in what they want without having to delete it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-18Fixed layout of video setup page when translatedBjørn Lindeijer1-1/+3
Introduced a LayoutHelper class which can be used for any non-Window container where you want to use a layout to place child widgets.
2009-01-18Fixed layout of video setup page when translatedBjørn Lindeijer1-0/+2
Introduced a LayoutHelper class which can be used for any non-Window container where you want to use a layout to place child widgets.
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams1-0/+4
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams1-0/+4
2009-01-15Integrated the ItemPopup class from Legends of Mazzeroth.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Added emote database, which is loosely based off of the NPC database.Ira Rice1-1/+2
Also changed all emotes to be animated sprites now, and to load from emotes.xml. This gives us a bit more flexibility to not only add more emotes in the future, but allowing them to be animated as well. NOTE: This commit, unlike the previous emote commits, breaks emotes if you don't have the xml file. This will be available on Aethyra soon, but is not rolled into an update at the moment. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Merged Tab and TabbedArea from mainlineBjørn Lindeijer1-2/+5
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 Lindeijer1-2/+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-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-8/+8
code so that only one term is used everywhere (to simplify maintainability), as well as corrected several variable names and comments where there was copy/pasted code, but it wasn't corrected. Also moved emote shortcuts back to where they were originally, to reduce player confusion when the next build comes around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-10Changed a few emote variable names to be more sensible, as well asIra Rice1-10/+10
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-08Fixed include order (pedantic change)Ira Rice1-0/+2
Conflicts: src/gui/smileycontainer.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Now, the real stage 2.0 of smiley window.Forge1-0/+2
All is done, and all files are now in the tree. (ok, copyright of new files is still opened... do as you want, if you care) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-08Removed the unused Box, VBox and HBox classesBjørn Lindeijer1-6/+0
They were once meant for doing layout, but never used and the way they're implemented they would be relayouting with every draw, which isn't really nice.
2009-01-08Removed the unused Box, VBox and HBox classesBjørn Lindeijer1-6/+0
They were once meant for doing layout, but never used and the way they're implemented they would be relayouting with every draw, which isn't really nice.
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond1-0/+2
Conflicts: src/Makefile.am src/game.cpp src/gui/browserbox.cpp src/gui/gui.cpp src/gui/textfield.cpp src/main.cpp (cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond1-0/+2
Conflicts: src/Makefile.am src/game.cpp src/gui/browserbox.cpp src/gui/gui.cpp src/gui/textfield.cpp src/main.cpp (cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
2009-01-06Merged layout handler from mainlineBjørn Lindeijer1-0/+2
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
2009-01-06Added support for internationalizationIra Rice1-2/+4
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Merged layout handler from mainlineBjørn Lindeijer1-1/+3
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
2009-01-06Added support for internationalizationBjørn Lindeijer1-1/+3
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
2009-01-05Modified the Aethyra client to use the TMW TrueType class, rather thanEugenio Favalli1-2/+2
the inbuilt GUIChan TrueType class. (Didn't use it originally because I didn't see the difference, when there's a considerable speedup, and that originally the import for TMW was broken code at the time, which has been fixed since.)
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer1-0/+2
2009-01-05Cleaned autotools filesGuillaume Melquiond1-6/+2
Put object files in subdirectories. Moved compilation flags to configure script. Added library header checks. (cherry picked from mainline commit 0bebbc320d50178a7ece573319cd6687a950dafa)
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer1-0/+2
2009-01-04Merged Vector class improvements from mainlineBjørn Lindeijer1-0/+1
2009-01-04Smiley step 1.91, the little part to make it workForge1-2/+10
TODO list of 1.9 still intact.
2008-12-29Removed TMW's truetype file, since we don't use it (accidentaly left itIra Rice1-2/+0
in) Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice1-0/+4
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/+2
(cherry-picked from mainline)
2008-12-09Removed the unused NewSkillDialogBjørn Lindeijer1-2/+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-07Added some initialization and removed ChargeDialogIra Rice1-2/+0
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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-0/+2
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-07Added some initialization and removed ChargeDialogBjørn Lindeijer1-2/+0
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>
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-16 13:07:16 +0000