Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
Already done and reviewed on the tmw branding repo.
|
|
It doesn't make sense on the generic client.
|
|
I also removed the fact to tell the number of language provided
as it's useless and harder to maintain.
|
|
Not always necessary, for example when installing in a user directory,
but not asking for admin rights does more harm than good (your average
Joe will just be complaining that the installer isn't working).
Reviewed-by: Yohann Ferreira
|
|
This is to make sure the right DLLs are shipped, not too many and not
too few.
Reviewed-by: Yohann Ferreira
|
|
Conflicts:
po/de.po
src/game.cpp
src/resources/wallpaper.cpp
|
|
|
|
Conflicts:
src/being.cpp
src/client.cpp
src/commandhandler.cpp
src/gui/setup_video.cpp
src/gui/socialwindow.cpp
src/gui/viewport.cpp
src/gui/widgets/browserbox.cpp
src/gui/widgets/itemcontainer.cpp
src/imageparticle.cpp
src/localplayer.cpp
src/localplayer.h
src/map.cpp
src/net/tmwa/beinghandler.cpp
src/particle.cpp
src/particle.h
src/player.cpp
src/player.h
|
|
Add portable option to windows installer.
Reviewed-by: Thorbjorn
|
|
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
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
|
|
|
|
|
|
This way we don't need to include the music in each Windows installer,
and people can avoid the extra megabytes when they don't care about the
music.
Patch provided by QOAL.
|
|
|
|
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
|
|
|
|
bumps).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Conflicts:
A lot of files...
|
|
Conflicts:
src/game.cpp
src/net/charserverhandler.cpp
src/net/loginhandler.cpp
src/net/protocol.h
|
|
Conflicts:
Almost everywhere.
|
|
extracted to the wrong directory.
|
|
extracted to the wrong directory.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
More branding-neutral == good
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit 1ac350cb425249f37961206a04427e084d2fa833)
Conflicts:
packaging/windows/setup.nsi
|
|
my mind.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
readme.txt explains a bit about how to build the Windows installer.
Conflicts:
packaging/windows/setup.nsi
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Conflicts:
debian/aethyra.docs
debian/aethyra.sgml
debian/tmw.docs
debian/tmw.sgml
packaging/debian/tmw.docs
packaging/debian/tmw.sgml
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
readme.txt explains a bit about how to build the Windows installer.
|
|
|