[openjk] branch master updated (cac96b4 -> 010973c)
Simon McVittie
smcv at debian.org
Mon Apr 27 21:28:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a change to branch master
in repository openjk.
from cac96b4 remove upstreamed patch
new ff1ddcb The EAX DLL is in fact non-free
new 3a4c094 New upstream snapshot. Exclude all of tools/ which is no longer needed
new a8df38c Imported Upstream version 0~20150420+dfsg1
new 80b9896 new upstream
new a784166 Fix some fallout from commit 03235915
new 9d73e13 Mark some unforwarded patches as such
new 6883f84 Adapt for new upstream installation layout with JediAcademy, JediOutcast dirs
new 010973c copyright: tweak syntax
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 85 +---
CMakeModules/InstallConfig.cmake | 163 +++++++
CMakeModules/InstallZIP.cmake | 1 +
code/CMakeLists.txt | 30 +-
code/client/cl_keys.cpp | 12 +-
code/client/cl_ui.cpp | 11 +-
code/game/CMakeLists.txt | 25 +-
code/game/Q3_Interface.cpp | 34 ++
code/game/Q3_Interface.h | 4 +
code/game/w_local.h | 27 +-
code/ghoul2/G2.h | 2 +-
code/qcommon/common.cpp | 42 ++
code/qcommon/qcommon.h | 2 +
code/qcommon/strippublic.h | 27 +-
code/rd-vanilla/CMakeLists.txt | 30 +-
code/rd-vanilla/G2_API.cpp | 2 +-
code/rd-vanilla/G2_bones.cpp | 5 +-
codeJK2/cgame/FxScheduler.cpp | 4 +-
codeJK2/cgame/FxScheduler.h | 2 +-
codeJK2/cgame/FxTemplate.cpp | 178 ++++----
codeJK2/cgame/cg_players.cpp | 2 +-
codeJK2/game/CMakeLists.txt | 32 +-
codeJK2/game/NPC.cpp | 30 +-
codeJK2/game/NPC_behavior.cpp | 28 +-
codeJK2/game/NPC_combat.cpp | 28 +-
codeJK2/game/NPC_goal.cpp | 32 +-
codeJK2/game/NPC_misc.cpp | 31 +-
codeJK2/game/NPC_move.cpp | 31 +-
codeJK2/game/NPC_reactions.cpp | 30 +-
codeJK2/game/NPC_senses.cpp | 31 +-
codeJK2/game/NPC_sounds.cpp | 31 +-
codeJK2/game/NPC_spawn.cpp | 32 +-
codeJK2/game/NPC_stats.cpp | 32 +-
codeJK2/game/NPC_utils.cpp | 31 +-
codeJK2/game/Q3_Interface.cpp | 192 ++++-----
codeJK2/game/Q3_Interface.h | 27 +-
codeJK2/game/Q3_Registers.cpp | 31 +-
codeJK2/game/Q3_Registers.h | 27 +-
codeJK2/game/g_nav.h | 27 +-
codeJK2/game/g_roff.cpp | 2 +-
codeJK2/game/g_utils.cpp | 2 +-
codeJK2/game/genericparser2.cpp | 39 +-
codeJK2/game/genericparser2.h | 31 +-
codeJK2/game/ghoul2_shared.h | 27 +-
codeJK2/game/npc_headers.h | 29 +-
codeJK2/game/objectives.h | 27 +-
codeJK2/game/say.h | 27 +-
codeJK2/game/statindex.h | 30 +-
codeJK2/game/surfaceflags.h | 30 +-
codeJK2/game/teams.h | 28 +-
codeJK2/game/w_local.h | 27 +-
codeJK2/game/weapons.h | 34 +-
codeJK2/game/wp_atst.cpp | 27 +-
codeJK2/game/wp_blaster_rifle.cpp | 27 +-
codeJK2/game/wp_bot_laser.cpp | 27 +-
codeJK2/game/wp_bowcaster.cpp | 28 +-
codeJK2/game/wp_bryar_pistol.cpp | 27 +-
codeJK2/game/wp_demp2.cpp | 27 +-
codeJK2/game/wp_det_pack.cpp | 27 +-
codeJK2/game/wp_disruptor.cpp | 27 +-
codeJK2/game/wp_emplaced_gun.cpp | 27 +-
codeJK2/game/wp_flechette.cpp | 27 +-
codeJK2/game/wp_melee.cpp | 27 +-
codeJK2/game/wp_repeater.cpp | 27 +-
codeJK2/game/wp_rocket_launcher.cpp | 27 +-
codeJK2/game/wp_saber.cpp | 30 +-
codeJK2/game/wp_saber.h | 27 +-
codeJK2/game/wp_stun_baton.cpp | 27 +-
codeJK2/game/wp_thermal.cpp | 27 +-
codeJK2/game/wp_trip_mine.cpp | 27 +-
codeJK2/icarus/icarus.h | 27 +-
codeJK2/icarus/interface.h | 27 +-
codeJK2/icarus/interpreter.h | 27 +-
codeJK2/icarus/tokenizer.h | 91 +---
codemp/CMakeLists.txt | 28 +-
codemp/cgame/CMakeLists.txt | 30 +-
codemp/client/cl_keys.cpp | 12 +-
codemp/client/cl_uiapi.cpp | 11 +-
codemp/game/CMakeLists.txt | 30 +-
codemp/ghoul2/g2_local.h | 2 +-
codemp/qcommon/common.cpp | 41 ++
codemp/qcommon/qcommon.h | 2 +
codemp/rd-dedicated/G2_API.cpp | 2 +-
codemp/rd-dedicated/G2_bones.cpp | 5 +-
codemp/rd-vanilla/CMakeLists.txt | 24 +-
codemp/rd-vanilla/G2_API.cpp | 2 +-
codemp/rd-vanilla/G2_bones.cpp | 5 +-
codemp/ui/CMakeLists.txt | 30 +-
debian/changelog | 2 +-
debian/copyright | 20 +-
debian/openjk-academy-server.init | 2 +-
debian/openjk-academy-server.install | 4 +-
debian/openjk-academy-server.links | 4 +-
debian/openjk-academy.install | 24 +-
debian/openjk-common.install | 14 +-
debian/openjk-common.links | 8 +-
debian/openjk-outcast.install | 25 +-
debian/openjk-outcast.links | 8 +-
...renderer-and-clients-to-a-bunch-of-unnece.patch | 14 +-
.../Fix-use-of-uninitialized-variable.patch | 2 +
...tokenizer-include-cstring-for-strcmp-memc.patch | 21 +
...P-JK2-g_savegame-silence-compiler-warning.patch | 49 +++
.../Select-C-11-mode-when-compiling-with-g.patch | 25 ++
.../Use-C-11-compliant-string-concatenation.patch | 466 +++++++++++++++++++++
...ep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch | 12 +-
.../codeJK2-replace-__cdecl-with-QDECL.patch | 34 ++
...b-out-debug-code-to-write-to-a-misc-Windo.patch | 2 +
debian/patches/series | 5 +
debian/rules | 50 +--
shared/sdl/sdl_icon.h | 38 +-
shared/sdl/sdl_input.cpp | 226 ++++++++--
shared/sdl/sdl_window.cpp | 4 +
shared/sys/sys_main.cpp | 6 +-
shared/sys/sys_public.h | 2 +
tools/Ibize/ibize_platform.h | 19 -
tools/do_dir_lists.bat | 50 ---
tools/mp3_wxb.bat | 1 -
tools/shader_strip.txt | 6 -
118 files changed, 2491 insertions(+), 1262 deletions(-)
create mode 100644 CMakeModules/InstallConfig.cmake
create mode 100644 debian/patches/JK2-icarus-tokenizer-include-cstring-for-strcmp-memc.patch
create mode 100644 debian/patches/SP-JK2-g_savegame-silence-compiler-warning.patch
create mode 100644 debian/patches/Select-C-11-mode-when-compiling-with-g.patch
create mode 100644 debian/patches/Use-C-11-compliant-string-concatenation.patch
create mode 100644 debian/patches/codeJK2-replace-__cdecl-with-QDECL.patch
delete mode 100644 tools/Ibize/ibize_platform.h
delete mode 100644 tools/do_dir_lists.bat
delete mode 100644 tools/mp3_wxb.bat
delete mode 100644 tools/shader_strip.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list