summaryrefslogtreecommitdiff
path: root/src/main.h
AgeCommit message (Collapse)AuthorFilesLines
2010-03-02Revert "Merge WindowContainer into Viewport and remove extra members"Jared Adams1-2/+3
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746. Conflicts: src/gui/gui.cpp src/gui/viewport.cpp
2010-03-01Merge WindowContainer into Viewport and remove extra membersJared Adams1-3/+2
Reviewed-by: Chuck Miller
2010-02-27Report more info on client in cURL useragent and DesktopJared Adams1-1/+28
Reviewed-by: Thorbjørn Lindeijer Reviewed-by: Chuck Miller
2010-02-23Updated some documentationThorbjørn Lindeijer1-8/+7
Also added generated documentation to the git ignore list. Reviewed-by: Jared Adams
2010-02-21Made tick counter and framerate limiter work during login sequenceThorbjørn Lindeijer1-67/+0
Much code was moved from main() to the new Client::exec(). This new event loop now integrates with the Game class, so that the tick counter and framerate limiter apply universally. The Client class is also responsible for some things that used to be global variables. Mantis-issue: ...
2010-02-22Modify copyright headersFreeyorp1-1/+2
2010-02-20License header update for The Mana ClientThorbjørn Lindeijer1-4/+3
2010-02-07Updated Copyright year to 2010!Bertram1-1/+1
Also added the update copyright tool from the Wormux Team. ( And not forgetting credit's due. :P )
2010-01-31Unify eAthena and manaserv support in to one build.Daniel Bradshaw1-12/+4
Finish support for server types in the server dialog. Using the new server type function, strip out ifdefs, replacing them with if blocks for later merging in smaller atomic commits. Remove any remaining references to the support defs, including in build system.
2010-01-12Standardize header orderJared Adams1-6/+6
Also remove some extra new lines and fix eAthena's PartyTab define guards.
2009-12-19Client now returns to server selection after server disconnectionStefan Dombrowski1-0/+9
This resolves http://bugs.manasource.org/view.php?id=37
2009-12-04Register credentials information serviceJared Adams1-6/+7
2009-12-04Using the updatehost that was given by EAthenaStefan Dombrowski1-0/+3
This is a patch for http://mantis.themanaworld.org/view.php?id=970
2009-11-03Remove more _SUPPORT ifdefs and do some cleanupJared Adams1-4/+6
2009-10-24Make homedir accessible from other filesJared Adams1-0/+2
2009-10-24Fix a type in main.hJared Adams1-1/+1
2009-10-24REplace instances of TMW with ManaJared Adams1-2/+2
2009-10-19Fix RegisterDialog tab order and detail lengthsJared Adams1-11/+0
2009-10-07Clean up state machine some moreJared Adams1-6/+9
2009-10-06Implemented server selection list loaded from online xml file.Andreas Habel1-0/+6
2009-10-04Add ability to delect characters from accountJared Adams1-2/+0
2009-10-03Do some more post-merge cleanupJared Adams1-6/+3
Fixes a few more bugs
2009-09-30Merge login state machines for both clientsJared Adams1-34/+29
Also do some cleanup and refactoring of related code.
2009-06-09Updated version and changes for 0.0.29.1 releaseBjørn Lindeijer1-1/+1
2009-05-25Add athena netcode for changing account password.Dennis Friis1-1/+1
(cherry picked from commit ef006ed117bb602a928d33dc0fe90075efd7393f)
2009-05-25Add change password dialog to athena clientDennis Friis1-2/+2
(cherry picked from commit 050103b8d2e3eb23e7aea188a1a269feb7c181ab)
2009-05-17Make the state variable a bit more type-safeBjørn Lindeijer1-2/+2
Should be no change in behaviour.
2009-05-17Init state variable to make valgrind happy.Dennis Friis1-2/+3
(cherry picked from commit 9b4d924d74587f489ac8141134b1c504e54a0684)
2009-04-12Moved client version string creation to preprocessorBjørn1-6/+10
2009-04-12Merge version strings, add version to setup, etcJared Adams1-0/+6
All instances of version strings should now use the same text. The version label was moved from main.cpp to Desktop. A new version label was added to SetupDialog to make it easier to get the version if you are already in game.
2009-04-10Introduced a Desktop widget to handle the wallpaperBjørn Lindeijer1-9/+0
Cleans up main.cpp a little.
2009-04-08Make some more file build for both serversJared Adams1-3/+0
Also some cleanup in main.cpp
2009-03-24Updated version to 0.0.29 in all the other placesThorbjørn Lindeijer1-1/+1
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-15/+75
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-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 Lindeijer1-1/+1
Conflicts: po/POTFILES.in src/main.cpp src/main.h tmw.cbp
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-11OSX version fixDavid Athay1-0/+2
2009-02-12Updated version to 0.0.28.1Bjørn Lindeijer1-1/+1
Also updated NEWS file with changes since 0.0.28.
2009-02-12OSX version fixDavid Athay1-0/+2
(cherry picked from commit 8046bb2626b30fecdcea54eb0aa3349cdb7d277b)
2009-02-11Merge branch 'master' of git@gitorious.org:tmw/eathenaDavid Athay1-2/+2
2009-02-11OSX version fixDavid Athay1-0/+2
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Changed AETHYRA_DATADIR to PKG_DATADIR.Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
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.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-2/+0
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?