Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
|
|
There is no reason why error.xml shouldn't be in this repository, as it is used
when no sprite data is present and is a very small file anyways. Servers can
still replace these if they want to. error.png is only used in sprites, so
should be in the new sprites folder too.
Reviewed-by: 4144
|
|
|
|
The guichan/widgetlistener.hpp file presence is now checked for both
autotools and cmake.
This resolves TMW-Mantis: #503
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Jared Adams
|
|
Also updated the list of files with strings to translate, the contact
address and the copyright assignment.
|
|
With CMakeLists.txt adaptions from the Aethyra project.
Reviewed-by: Bernd Wachter
Reviewed-by: Jared Adams
|
|
|
|
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.
|
|
|
|
When you'd like a client for the eAthena server, pass
--with-server=eathena to configure.
|
|
|
|
|
|
|
|
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!
|
|
Preparation for universal client.
|
|
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
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also updated NEWS file with changes since 0.0.28.
|
|
To be released hopefully tomorrow.
|
|
then this build might be official)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
|
|
Put object files in subdirectories. Moved compilation flags to configure
script. Added library header checks.
(cherry picked from mainline commit 0bebbc320d50178a7ece573319cd6687a950dafa)
|
|
(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1)
Conflicts:
src/gui/gui.cpp
|
|
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>
|
|
(cherry-picked from mainline)
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
|
|
|
|
it contains the complete ISO-8859-15 character set, as well as made a
few other smaller fixes towards fixing make dist.
|
|
fix make dist yet, but at least these files aren't out of date any more.
|
|
contributed and I forgot you, please contact me as soon as possible!
|
|
|
|
|
|
|
|
|
|
was found.
|
|
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r3962 | crush_tmw | 2008-03-09 16:35:00 +0100 (Sun, 09 Mar 2008) | 1 line
Applied some patches by peavey related to chatlog and the quit dialog.
........
r3968 | umperio | 2008-03-11 14:56:47 +0100 (Tue, 11 Mar 2008) | 1 line
Removed unused image.
........
r3969 | b_lindeijer | 2008-03-11 17:44:20 +0100 (Tue, 11 Mar 2008) | 2 lines
Also removed unused image from the files to be installed.
........
r4006 | crush_tmw | 2008-03-26 00:28:05 +0100 (Wed, 26 Mar 2008) | 1 line
Initialized some uninitialized variables (patch by peavey).
........
r4008 | b_lindeijer | 2008-03-27 15:51:10 +0100 (Thu, 27 Mar 2008) | 2 lines
Applied patch by peavey and added his name to the ChangeLog some more.
........
r4010 | b_lindeijer | 2008-03-30 16:06:14 +0200 (Sun, 30 Mar 2008) | 2 lines
Updated configure.ac for tmwdata split (patch by peavey).
........
r4018 | crush_tmw | 2008-04-01 03:02:30 +0200 (Tue, 01 Apr 2008) | 1 line
Added makefile for TMXCopy by jaxad.
........
r4019 | crush_tmw | 2008-04-01 03:34:29 +0200 (Tue, 01 Apr 2008) | 1 line
compilation fixes suggested by peavey.
........
r4020 | crush_tmw | 2008-04-01 03:37:51 +0200 (Tue, 01 Apr 2008) | 1 line
renaming makefile to Makefile
........
r4021 | crush_tmw | 2008-04-01 03:38:35 +0200 (Tue, 01 Apr 2008) | 1 line
renaming makefile to Makefile
........
|
|
|
|
|
|
|
|
including optimization of OpenGL memory usage on modern OpenGL drivers.
Patches by Guillaume Melquiond.
|
|
|
|
handling. Reduced memory usage when using OpenGL. (Up to 95% reduction for some textures.)
|
|
redundant HAS_CONFIG_H macro. Used autopoint for generating gettext environment. Removed auto-generated file from po directory.
|
|
strings to french.
|
|
|
|
|