Age | Commit message (Collapse) | Author | Files | Lines |
|
This was already done in the log, when responding to the --version
parameter and for the label on the Desktop widget, but not in the Setup
window. Now it is consistently part of the FULL_VERSION define.
|
|
The configured file wasn't actually being used, because it was not in
the include path. Instead, a checked in version was used.
In addition, winver.h is an existing Windows header, which was
conflicting with the generated file. Instead, now mana.rc itself is
configured. We didn't actually need winver.h anywhere else, anyway.
|
|
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
|
|
enforced by -std=c++0x
Reviewed-by: Thorbjørn Lindeijer
|
|
Conflicts:
CMakeLists.txt
src/map.cpp
src/winver.h
|
|
|
|
Conflicts:
CMakeLists.txt
po/fi.po
po/fr.po
src/gui/skilldialog.cpp
src/localplayer.cpp
src/net/manaserv/generalhandler.cpp
src/net/tmwa/buysellhandler.cpp
src/net/tmwa/generalhandler.cpp
src/net/tmwa/playerhandler.cpp
src/net/tmwa/specialhandler.cpp
src/winver.h
|
|
Reviewed-by: Stefan Dombrowski
Reviewed-by: Yohann Ferreira
|
|
Conflicts:
CMakeLists.txt
po/pt_BR.po
po/ru.po
src/winver.h
|
|
|
|
|
|
Removing mana-ea.rc, because it was the same as mana.rc.
Reviewed-by: Aard, Bertram
|
|
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.
Conflicts:
src/gui/gui.cpp
src/gui/viewport.cpp
|
|
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Chuck Miller
|
|
Also added generated documentation to the git ignore list.
Reviewed-by: Jared Adams
|
|
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: ...
|
|
|
|
|
|
Also added the update copyright tool from the Wormux Team.
( And not forgetting credit's due. :P )
|
|
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.
|
|
Also remove some extra new lines and fix eAthena's PartyTab define guards.
|
|
This resolves http://bugs.manasource.org/view.php?id=37
|
|
|
|
This is a patch for
http://mantis.themanaworld.org/view.php?id=970
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fixes a few more bugs
|
|
Also do some cleanup and refactoring of related code.
|
|
|
|
(cherry picked from commit ef006ed117bb602a928d33dc0fe90075efd7393f)
|
|
(cherry picked from commit 050103b8d2e3eb23e7aea188a1a269feb7c181ab)
|
|
Should be no change in behaviour.
|
|
(cherry picked from commit 9b4d924d74587f489ac8141134b1c504e54a0684)
|
|
|
|
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.
|
|
Cleans up main.cpp a little.
|
|
Also some cleanup in main.cpp
|
|
|
|
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!
|
|
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
|
|
Conflicts:
po/POTFILES.in
src/main.cpp
src/main.h
tmw.cbp
|