summaryrefslogtreecommitdiff
path: root/src/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2009-03-26Add WhisperTabsJared Adams1-0/+2
2009-03-27Removed the unused BuddyList classBjørn Lindeijer1-2/+0
This class would store the buddy list in a file on the client, which is really not that useful. It was removed before in d268447e18c6e3edd80658f8f8d4317740c33af9, but apprently had come back with the merge with mainline.
2009-03-26Add ChannelTab for chat channelsJared Adams1-0/+2
This fixes TMWServ compilation form the previous commit.
2009-03-26Move ChatWindow over to ChatTabsJared Adams1-0/+2
TMWServ compilation is likely not functional after this, I didn't check. THe next commit will address that.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-2/+13
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+8
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams1-57/+59
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-23Merge eA's command handling into CommandHandlerJared Adams1-2/+2
Also drop Aethyra's custom magic code
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-47/+155
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-03-14Made a label class derived from the guichan label class which utilizesIra Rice1-0/+2
the palette colors. While technically, this can be accomplished through other means, it's rather clumsy overall, and is prone to introducing in programmer errors. This commit finally catches every case where text is used, and applies the text color from the color dialog to each of them appropriately. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-12Extend color config gui to support the new colorsMajin Sniper1-1/+3
The new color palette supports many more colors that the browserbox can display. So a change to the color config gui was needed.
2009-03-12Extending the internal handling of colorssniper1-2/+3
The internal storage for colors was in the file color.h/color.cpp. It mainly managed the colors in the chat. The Color class was extended to be more generic now and it stores gcn::Color objects instead of integers now. A lot of new colortypes are now available, though not many of them are used for now, that will come in the next patches. The Color class was renamed to Palette and color.{h,cpp} to palette.{h,cpp} to better describe its purpose. The color config gui now lists the new colors, even changes them, but the result is not displayed properly for now.
2009-03-12Extend color config gui to support the new colorsMajin Sniper1-0/+3
The new color palette supports many more colors that the browserbox can display. So a change to the color config gui was needed.
2009-03-12Extending the internal handling of colorssniper1-2/+2
The internal storage for colors was in the file color.h/color.cpp. It mainly managed the colors in the chat. The Color class was extended to be more generic now and it stores gcn::Color objects instead of integers now. A lot of new colortypes are now available, though not many of them are used for now, that will come in the next patches. The Color class was renamed to Palette and color.{h,cpp} to palette.{h,cpp} to better describe its purpose. The color config gui now lists the new colors, even changes them, but the result is not displayed properly for now.
2009-03-11Added a new Popup class, which overall is functionally similar to theIra Rice1-0/+2
Window class, but stripped down to the bare essential functionality to just draw and position them. This means no resizing, no close buttons, no ability to move them, etc. This should help reduce the overhead in drawing speech bubbles, as well as other popup type dialogs, but is also not a drop in replacement for the Window class as well. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-11Moved the Skin class outside of the Window class, in order to allowIra Rice1-0/+2
other widget containers to use skins as well, and to make it easier to extend later. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-09Add an interface for eAthena's storage systemJared Adams1-0/+2
2009-03-08Add an interface for eAthena's storage systemJared Adams1-0/+2
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-2/+2
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-2/+2
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
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-09Mostly whitespace and formatting changesBjørn Lindeijer1-5/+5
(merged from eAthena client)
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-13Added new file to other build systemsDavid Athay1-0/+2
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>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-23 00:40:57 +0000