summaryrefslogtreecommitdiff
path: root/src/main.cpp
AgeCommit message (Collapse)AuthorFilesLines
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-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-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 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-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
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-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-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.
2008-12-02Fix 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-11-21Added the setup button to show when the client is loaded, since all of Ira Rice1-0/+37
the settings in it can be changed on client startup and aren't game specific.
2008-11-21Fixed the linker error that we've been having. Apparently, it was caused Ira Rice1-14/+16
by me accidently removing the include for main.h in openglgraphics.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-18/+15
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-02Ported a patch from TMW by fate which de-hardcodes skills, as well as ↵Ira Rice1-1/+2
removes the server sending out view id's for gloves and boots (which weren't needed.) Here's the full log: * Updated GUI table and model to better handle NULL widgets during initialisation * On SMSG_MOVE et al., ignore boots and glove information-- that information is incorrect and we're guaranteed to already have the correct information anyway. * Properly decode `is dead' information for PCs, so that dead players, when encountered, will be lying on the ground, dead, rather than standing. * Use `skills.xml' file from client data to determine skill names * Report client version number (hereby bumped to 1) in unused charserver slot (ignored by vanilla eAthena)
2008-11-01* Updated GUI table and model to better handle NULL widgets during ↵Fate1-1/+2
initialisation * On SMSG_MOVE et al., ignore boots and glove information-- that information is incorrect and we're guaranteed to already have the correct information anyway. * Properly decode `is dead' information for PCs, so that dead players, when encountered, will be lying on the ground, dead, rather than standing. * Use `skills.xml' file from client data to determine skill names * Report client version number (hereby bumped to 1) in unused charserver slot (ignored by vanilla eAthena)
2008-10-26Fixed some compile errors that occured from restructuring.Ira Rice1-3/+4
2008-10-25Imported --data parameter from TMW.Ira Rice1-29/+37
2008-10-23Cleaned up ColorDB code so that it loads with all other databases, as Ira Rice1-0/+3
well as fixed color cycling.
2008-10-22Merged revisions 4145 via svnmerge from Bjørn Lindeijer1-3/+11
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk With help from Kess (vargavind) ........ r4145 | b_lindeijer | 2008-04-20 19:29:11 +0200 (Sun, 20 Apr 2008) | 3 lines Added --data parameter to be used to specify where to get the data from when using --skipupdate. ........
2008-10-12Added in a new tileset, as well as some new artwork, changed the update Ira Rice1-2/+2
handler to store updates in a subfolder based on port (so that if one server domain hosts multiple update folders, that it doesn't have to redownload an update should an update have the same name as the other server, as well as a different checksum), and made the inventory window display the units of measurement (for all of those people that wanted to know exactly what those units were supposed to be).
2008-10-12This commit contains three things: one, after looking over how TMW was Ira Rice1-5/+9
handling the effects through the level up system, I determined that it wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page css so that it better matches the forum. And three, I patched text wrapping so that it'll fix up its display size based on all previous lines, except for the last line. That fix will come later, but for now, it'll be seen as a special case. While you'd like to think that just resending the string and starting the function over again would fix it, you'd be wrong. So it won't be patched until I think of a better way to handle that case.
2008-09-29Modified the client so that it displays both servers as server choices, Ira Rice1-3/+3
as well as changing the default server to point to www.aethyra.org instead of Slinker's IP address now.
2008-09-13changed the update host line 169 in main.cppKevin Day1-1/+1
2008-09-12Changed default port for Aethyra server to 21001Lloyd Bryant1-1/+1
2008-09-04Added code to change text colouringDouglas Boffey1-0/+6
2008-09-01Added a few known issues to WinReadMe.txt.Kraant1-0/+4
Also changed main.cpp to define usleep for the windows compile.
2008-08-26Corrected position of registration dialogsDouglas Boffey1-1/+23
2008-08-26Corrected splash screen problem as per mantis #52Douglas Boffey1-1/+1
2008-08-19Added handling for different resolution wallpapers, reduced CPU usage during ↵Lloyd Bryant1-10/+27
login sequence
2008-08-09Changed --skipupdate functionality to just skip the actual downloadsLloyd Bryant1-12/+13
2008-08-07Updated default game and updates serversKraant1-2/+2
2008-08-07Rebranding TME to AethyraKraant1-19/+19
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-18 19:31:56 +0000