[openjk] 06/07: Merge tag 'upstream/0_20150208+ds1'

Simon McVittie smcv at debian.org
Sun Feb 8 21:54:16 UTC 2015


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit 3ea98a3bfce1d04b6f33f7647adf8496e7f829fc
Merge: 8467c3c 5519f0f
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Feb 8 17:36:15 2015 +0000

    Merge tag 'upstream/0_20150208+ds1'
    
    Upstream version 0~20150208+ds1

 CMakeLists.txt                                     |    15 +-
 README.md                                          |     8 +-
 code/CMakeLists.txt                                |   105 +-
 code/cgame/FxScheduler.cpp                         |     2 +-
 code/cgame/FxScheduler.h                           |     9 +-
 code/cgame/animtable.h                             |     2 +
 code/cgame/cg_consolecmds.cpp                      |     1 +
 code/cgame/cg_credits.cpp                          |    20 +-
 code/cgame/cg_draw.cpp                             |   194 +
 code/cgame/cg_local.h                              |     4 +-
 code/cgame/cg_main.cpp                             |    11 +-
 code/cgame/cg_text.cpp                             |     2 +-
 code/client/cl_cgame.cpp                           |    33 +-
 code/client/cl_cin.cpp                             |     4 +-
 code/client/cl_console.cpp                         |     5 +-
 code/client/cl_main.cpp                            |    40 +-
 code/client/cl_scrn.cpp                            |    27 +-
 code/client/cl_ui.cpp                              |     5 +-
 code/client/client.h                               |     3 +-
 code/client/snd_ambient.cpp                        |    14 +-
 code/client/snd_ambient.h                          |     6 +-
 code/client/snd_dma.cpp                            |     2 +-
 code/client/snd_mem.cpp                            |     2 +-
 code/client/snd_music.cpp                          |    14 +-
 code/client/vmachine.cpp                           |   101 +-
 code/client/vmachine.h                             |    44 +-
 code/game/CMakeLists.txt                           |     7 +-
 code/game/NPC_combat.cpp                           |    14 +-
 code/game/Q3_Interface.h                           |     8 +-
 code/game/anims.h                                  |     2 +
 code/game/b_public.h                               |     3 +
 code/game/bg_pmove.cpp                             |     2 +
 code/game/bg_vehicleLoad.cpp                       |     2 +-
 code/game/g_active.cpp                             |    18 +-
 code/game/g_main.cpp                               |     2 +-
 code/game/g_ref.cpp                                |     6 +-
 code/game/g_savegame.cpp                           |     6 +-
 code/game/g_spawn.cpp                              |    19 +-
 code/game/g_svcmds.cpp                             |    82 +-
 code/game/ghoul2_shared.h                          |    17 +-
 code/ghoul2/ghoul2_gore.h                          |     2 +-
 code/icarus/IcarusImplementation.h                 |    10 +-
 code/icarus/Sequencer.cpp                          |    10 +-
 code/icarus/StdAfx.h                               |     2 -
 code/icarus/blockstream.h                          |     2 +-
 code/icarus/sequence.h                             |     4 +-
 code/icarus/sequencer.h                            |     6 +-
 code/icarus/taskmanager.h                          |    12 +-
 code/macosx/macosx_glimp.h                         |    37 -
 code/mp3code/cupl3.c                               |     4 +
 code/mp3code/jdw.h                                 |     6 -
 code/qcommon/cm_test.cpp                           |     1 -
 code/qcommon/common.cpp                            |    66 +-
 code/qcommon/files.cpp                             |     7 +-
 code/qcommon/q_shared.h                            |    48 +-
 code/qcommon/qcommon.h                             |   135 +-
 code/qcommon/stringed_ingame.cpp                   |    43 +-
 code/qcommon/stringed_interface.cpp                |     5 +-
 code/qcommon/stringed_interface.h                  |     3 +-
 code/qcommon/strip.cpp                             |    34 +-
 code/qcommon/z_memman_pc.cpp                       |     4 +-
 code/rd-common/tr_font.cpp                         |    16 +-
 code/rd-common/tr_public.h                         |    21 +-
 code/rd-common/tr_types.h                          |     2 +-
 code/rd-vanilla/CMakeLists.txt                     |    34 +-
 code/rd-vanilla/G2_API.cpp                         |    32 +-
 code/rd-vanilla/G2_bones.cpp                       |     4 +-
 code/rd-vanilla/G2_misc.cpp                        |    22 +-
 code/rd-vanilla/glext.h                            | 11770 +++++++++++++++++++
 code/rd-vanilla/qgl.h                              |  1073 +-
 code/rd-vanilla/tr_backend.cpp                     |   264 +-
 code/rd-vanilla/tr_ghoul2.cpp                      |     4 +-
 code/rd-vanilla/tr_image.cpp                       |    48 +-
 code/rd-vanilla/tr_init.cpp                        |   889 +-
 code/rd-vanilla/tr_local.h                         |    23 +-
 code/rd-vanilla/tr_model.cpp                       |     6 +-
 code/rd-vanilla/tr_quicksprite.cpp                 |    11 +-
 code/rd-vanilla/tr_quicksprite.h                   |    10 -
 code/rd-vanilla/tr_shader.cpp                      |    36 +
 code/rd-vanilla/tr_subs.cpp                        |    10 -
 code/sdl/sdl_glimp.cpp                             |  1089 --
 code/sdl/sdl_input.cpp                             |   940 --
 code/sdl/sdl_qgl.h                                 |   393 -
 code/sdl/sdl_snd.cpp                               |   293 -
 code/server/sv_game.cpp                            |    67 +-
 code/server/sv_savegame.cpp                        |     3 +-
 code/server/sv_world.cpp                           |     1 -
 code/sys/sys_local.h                               |    15 -
 code/sys/sys_main.cpp                              |   385 -
 code/sys/sys_unix.cpp                              |   638 -
 code/ui/ui_main.cpp                                |    25 +-
 code/ui/ui_shared.cpp                              |     4 +-
 code/ui/ui_shared.h                                |    11 -
 codeJK2/cgame/FxScheduler.h                        |     3 -
 codeJK2/cgame/cg_credits.cpp                       |     4 +-
 codeJK2/game/ghoul2_shared.h                       |     1 -
 codeJK2/icarus/Sequencer.cpp                       |    10 +-
 codeJK2/icarus/blockstream.h                       |     2 -
 codeJK2/icarus/sequencer.h                         |     2 -
 codemp/CMakeLists.txt                              |   135 +-
 codemp/cgame/cg_players.c                          |    12 +-
 codemp/cgame/cg_playerstate.c                      |     2 -
 codemp/client/FxScheduler.cpp                      |    21 +-
 codemp/client/FxScheduler.h                        |    11 +-
 codemp/client/cl_avi.cpp                           |     8 +-
 codemp/client/cl_cgame.cpp                         |    10 -
 codemp/client/cl_main.cpp                          |    36 +-
 codemp/client/cl_parse.cpp                         |     2 +-
 codemp/client/client.h                             |     2 -
 codemp/client/snd_ambient.cpp                      |    14 +-
 codemp/client/snd_ambient.h                        |     6 +-
 codemp/client/snd_dma.cpp                          |     6 +-
 codemp/client/snd_mem.cpp                          |     2 +-
 codemp/client/snd_music.cpp                        |    25 +-
 codemp/game/bg_misc.c                              |     2 +-
 codemp/game/g_bot.c                                |     6 +-
 codemp/game/g_cmds.c                               |    47 +-
 codemp/game/g_local.h                              |     2 -
 codemp/game/g_main.c                               |    14 -
 codemp/game/g_mem.c                                |     2 +-
 codemp/game/g_saga.c                               |     2 +-
 codemp/game/g_target.c                             |     2 +-
 codemp/game/w_force.c                              |    10 +-
 codemp/ghoul2/G2_gore.h                            |     2 +-
 codemp/ghoul2/g2_local.h                           |     8 +-
 codemp/ghoul2/ghoul2_shared.h                      |    10 +-
 codemp/icarus/GameInterface.h                      |     7 +-
 codemp/icarus/Q3_Registers.h                       |     4 +-
 codemp/icarus/Sequencer.cpp                        |    11 +-
 codemp/icarus/blockstream.h                        |     3 +-
 codemp/icarus/instance.h                           |     6 +-
 codemp/icarus/interpreter.h                        |     9 +-
 codemp/icarus/sequence.h                           |     6 +-
 codemp/icarus/sequencer.h                          |     8 +-
 codemp/icarus/taskmanager.h                        |    14 +-
 codemp/icarus/tokenizer.h                          |     8 +-
 codemp/macosx/macosx_qgl.h                         |  5097 --------
 codemp/mp3code/cupl3.c                             |     4 +
 codemp/mp3code/jdw.h                               |     6 -
 codemp/qcommon/RoffSystem.h                        |     5 +-
 codemp/qcommon/cm_patch.cpp                        |     2 +-
 codemp/qcommon/common.cpp                          |    84 +-
 codemp/qcommon/cvar.cpp                            |    18 +-
 codemp/qcommon/files.cpp                           |     6 +-
 codemp/qcommon/msg.cpp                             |    76 +-
 codemp/qcommon/net_ip.cpp                          |    15 +-
 codemp/qcommon/q_math.c                            |     6 +-
 codemp/qcommon/q_shared.c                          |    74 +-
 codemp/qcommon/q_shared.h                          |    17 +-
 codemp/qcommon/qcommon.h                           |   162 +-
 codemp/qcommon/stringed_ingame.cpp                 |    41 +-
 codemp/qcommon/stringed_interface.cpp              |     5 +-
 codemp/qcommon/stringed_interface.h                |     3 +-
 codemp/qcommon/vm.cpp                              |     8 +-
 codemp/qcommon/z_memman_pc.cpp                     |     4 +-
 codemp/rd-common/tr_font.cpp                       |    12 +-
 codemp/rd-common/tr_image_jpg.cpp                  |     5 +-
 codemp/rd-common/tr_public.h                       |    17 +-
 codemp/rd-dedicated/G2_API.cpp                     |    10 +-
 codemp/rd-dedicated/G2_bones.cpp                   |     2 +-
 codemp/rd-dedicated/G2_misc.cpp                    |    22 +-
 codemp/rd-dedicated/tr_ghoul2.cpp                  |     6 +-
 codemp/rd-dedicated/tr_init.cpp                    |     8 +-
 codemp/rd-dedicated/tr_local.h                     |     8 -
 codemp/rd-dedicated/tr_main.cpp                    |     5 -
 codemp/rd-dedicated/tr_model.cpp                   |     9 +-
 codemp/rd-dedicated/tr_skin.cpp                    |     1 -
 codemp/rd-vanilla/CMakeLists.txt                   |    37 +-
 codemp/rd-vanilla/G2_API.cpp                       |     8 +-
 codemp/rd-vanilla/G2_bones.cpp                     |     2 +-
 codemp/rd-vanilla/G2_misc.cpp                      |    22 +-
 codemp/rd-vanilla/glext.h                          | 11770 +++++++++++++++++++
 codemp/rd-vanilla/qgl.h                            |  1087 +-
 codemp/rd-vanilla/tr_backend.cpp                   |   264 +-
 codemp/rd-vanilla/tr_cmds.cpp                      |     4 +-
 codemp/rd-vanilla/tr_ghoul2.cpp                    |    10 +-
 codemp/rd-vanilla/tr_image.cpp                     |    46 +-
 codemp/rd-vanilla/tr_init.cpp                      |   727 +-
 codemp/rd-vanilla/tr_light.cpp                     |     3 +-
 codemp/rd-vanilla/tr_local.h                       |    28 +-
 codemp/rd-vanilla/tr_main.cpp                      |     5 -
 codemp/rd-vanilla/tr_model.cpp                     |     9 +-
 codemp/rd-vanilla/tr_quicksprite.cpp               |    11 +-
 codemp/rd-vanilla/tr_quicksprite.h                 |     2 +-
 codemp/rd-vanilla/tr_shader.cpp                    |    35 +
 codemp/rd-vanilla/tr_subs.cpp                      |    10 -
 codemp/sdl/sdl_glimp.cpp                           |  1120 --
 codemp/server/NPCNav/navigator.cpp                 |    16 +-
 codemp/server/NPCNav/navigator.h                   |    20 +-
 codemp/server/sv_bot.cpp                           |     2 +-
 codemp/server/sv_ccmds.cpp                         |     2 +-
 codemp/server/sv_client.cpp                        |    23 +-
 codemp/server/sv_init.cpp                          |     1 -
 codemp/server/sv_main.cpp                          |     8 +-
 codemp/sys/sys_loadlib.h                           |    26 -
 codemp/sys/sys_local.h                             |    13 -
 codemp/sys/sys_main.cpp                            |   624 -
 codemp/ui/ui_main.c                                |    20 +-
 codemp/ui/ui_shared.c                              |     9 +-
 codemp/win32/glw_win.h                             |     5 +-
 codemp/win32/win_local.h                           |     1 +
 codemp/win32/win_main.cpp                          |   790 +-
 codemp/win32/win_main_ded.cpp                      |   979 +-
 codemp/win32/win_shared.cpp                        |   252 +-
 lib/minizip/unzip.cpp                              |     9 +-
 {codemp => shared}/sdl/sdl_input.cpp               |    42 +-
 {codemp => shared}/sdl/sdl_qgl.h                   |    39 +-
 codemp/sdl/sdl_snd.cpp => shared/sdl/sdl_sound.cpp |     0
 shared/sdl/sdl_window.cpp                          |   732 ++
 shared/sys/con_local.h                             |    13 +
 shared/sys/con_log.cpp                             |    57 +
 .../macosx_glimp.h => shared/sys/con_passive.cpp   |    65 +-
 shared/sys/con_tty.cpp                             |   535 +
 shared/sys/con_win32.cpp                           |   555 +
 {codemp => shared}/sys/snapvector.cpp              |     0
 shared/sys/sys_event.cpp                           |   113 +
 {code => shared}/sys/sys_loadlib.h                 |     0
 shared/sys/sys_local.h                             |    20 +
 shared/sys/sys_main.cpp                            |   727 ++
 shared/sys/sys_public.h                            |   162 +
 {codemp => shared}/sys/sys_unix.cpp                |   314 +-
 shared/sys/sys_win32.cpp                           |   563 +
 {codemp => shared}/sys/unix_local.h                |     0
 223 files changed, 30854 insertions(+), 16759 deletions(-)

-- 
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