summaryrefslogtreecommitdiff
path: root/src/main.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-5/+5
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merge branch 'master' of git@gitorious.org:tmw/eathenaBjørn Lindeijer1-1/+4
Conflicts: src/game.cpp src/net/charserverhandler.cpp src/net/loginhandler.cpp src/net/protocol.h
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-125/+242
Conflicts: Almost everywhere.
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer1-1/+1
(merged from eAthena client)
2009-02-07Some more include cleanups.Ira Rice1-4/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-0/+1
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-27Enabled gettext translations on windows.Philipp Sehmisch1-2/+5
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-1/+1
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-1/+1
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-19Fixed a directory creation error reported by our Windows users (whyIra Rice1-9/+39
doesn't PhysFS handle this properly?!?) when there's already an update directory. Also fixed the recorder class so that it's fixed on Windows as well. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-16Candidate release for 0.0.27.1 (Windows needs to get colors fixed, andIra Rice1-1/+1
then this build might be official) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Added emote database, which is loosely based off of the NPC database.Ira Rice1-2/+5
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-12Fixed a path error that slipped through by accident.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-4/+4
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-09Added the ability to see your own name in game.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Fixed color setup dialog (which was uninitialized in older commits whenIra Rice1-3/+3
the setup button was created ) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-08Fixed include order (pedantic change)Ira Rice1-0/+6
Conflicts: src/gui/smileycontainer.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-08Made remaining dialogs translatableBjørn Lindeijer1-45/+45
Most strings are now translatable. Please do report any missing ones. Strings excluded from translation are anything that gets written to the log file or is otherwise not shown in the GUI. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-01-09Now, the real stage 2.0 of smiley window.Forge1-0/+6
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-08Made remaining dialogs translatableBjørn Lindeijer1-6/+7
Most strings are now translatable. Please do report any missing ones. Strings excluded from translation are anything that gets written to the log file or is otherwise not shown in the GUI. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-01-06Removed the now unnecessary SDL_TTF initializations.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Correct the codeset for translations to be UTF-8Bjørn Lindeijer1-0/+1
As on the mainline client
2009-01-06Correct the codeset for translations to be UTF-8Bjørn Lindeijer1-0/+1
As on the mainline client
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond1-1/+1
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-2/+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 internationalizationIra Rice1-1/+13
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-06Added support for internationalizationBjørn Lindeijer1-1/+13
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-1/+3
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-5/+5
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Fix typo in updatehost reported by Jaxad.Dennis Friis1-1/+1
(cherry picked from eAthena client)
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-26Fixed a potential leak in setup, changed the default border color toIra Rice1-1/+1
white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-21Fixed wallpaper selection to be handled correctly.Ira Rice1-3/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-20Enabled video mode switching, as well as got rid of an old, unneededIra Rice1-11/+10
check in the ColorDB. Signed-off-by: Ira Rice <irarice@gmail.com>
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-07Tweaked some configuration defaultsBjørn Lindeijer1-1/+1
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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-11/+24
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-07Tweaked some configuration defaultsBjørn Lindeijer1-1/+1
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-07Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues. (cherry picked from eAthena commit 07c2da75b7d994ab097e7c50d865bee929623685) Conflicts: src/main.cpp
2008-12-06Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues.
2008-12-03Don't reuse the setupWindow variable from the gameBjørn Lindeijer1-2/+2
Fixes crash on exit caused by double deletion.
2008-12-04Don't reuse the setupWindow variable from the gameBjørn Lindeijer1-2/+2
Fixes crash on exit caused by double deletion.
2008-12-04Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Revised pointer deletion based on Bjorn's suggestion.Ira Rice1-0/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Fixed pointer deletion so that the setup window doesn't get doubleIra Rice1-2/+0
deleted. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Added the setup button to show when the client is loaded, since all ofIra Rice1-0/+37
the settings in it can be changed on client startup and aren't game specific.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-07 09:07:36 +0000