This is an automated email from the git hooks/post-receive script.
smcv pushed a change to branch upstream
in repository darkplaces.
from b343f6f Merge remote-tracking branch 'origin/upstream' into upstream
new 0e5e5b5 Imported Upstream version 0~20140513+svn12208
new ba17a12 Imported Upstream version 0~20140513+svn12208
The 2 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:
.gitignore | 1 +
.travis-before_install-xonotic.sh | 69 +
.travis-id_rsa-xonotic | Bin 0 -> 3248 bytes
.travis-script-xonotic.sh | 128 ++
.travis.yml | 32 +
BSDmakefile | 78 +-
DPiOS.xcodeproj/project.pbxproj | 142 +-
.../project.xcworkspace/contents.xcworkspacedata | 7 +
Info.plist | 16 +-
SDLMain.m | 6 +-
builddate.c | 9 +-
cap_avi.c | 2 +-
cap_ogg.c | 4 +-
cl_collision.c | 173 +--
cl_collision.h | 4 +-
cl_demo.c | 4 +
cl_input.c | 39 +-
cl_main.c | 43 +-
cl_parse.c | 73 +-
cl_particles.c | 152 +-
cl_screen.c | 115 +-
cl_video.c | 2 +
client.h | 38 +-
clvm_cmds.c | 71 +-
cmd.c | 20 +-
cmd.h | 4 +
collision.c | 392 ++---
collision.h | 47 +-
common.c | 105 +-
common.h | 10 +
console.c | 250 +--
crypto.c | 183 ++-
crypto.h | 10 +-
csprogs.c | 32 +-
csprogs.h | 2 +-
cvar.c | 30 +
darkplaces-dedicated-vs2010.vcxproj | 5 +-
darkplaces-dedicated-vs2012.vcxproj | 23 +-
darkplaces-dedicated.vcproj | 8 +-
darkplaces-sdl-vs2010.vcxproj | 6 +-
darkplaces-sdl-vs2012.vcxproj | 24 +-
darkplaces-sdl.dsp | 8 -
darkplaces-sdl.vcproj | 12 +-
darkplaces-wgl-vs2010.vcxproj | 6 +-
darkplaces-wgl-vs2012.vcxproj | 16 +-
darkplaces-wgl.vcproj | 12 +-
darkplaces.cbp | 464 ++++++
darkplaces.dsp | 8 -
dpdefs/csprogsdefs.qc | 48 +-
dpdefs/dpextensions.qc | 38 +-
dpdefs/keycodes.qc | 24 +-
dpdefs/menudefs.qc | 22 +-
dpdefs/progsdefs.qc | 2 +-
dpsoftrast.c | 8 +-
dpsoftrast.h | 3 +-
fs.c | 180 ++-
fs.h | 2 -
ft2.c | 102 +-
ft2.h | 4 +
gl_backend.c | 387 +++--
gl_backend.h | 5 +-
gl_draw.c | 21 +-
gl_rmain.c | 457 ++++--
gl_rsurf.c | 39 +-
gl_textures.c | 197 ++-
glquake.h | 37 +-
host.c | 37 +-
host_cmd.c | 136 +-
image.c | 55 +-
image.h | 6 +
image_png.c | 2 +
jpeg.c | 10 +-
keys.c | 68 +-
lhnet.c | 23 +-
libcurl.c | 279 +++-
libcurl.h | 3 +-
makefile | 124 +-
makefile.inc | 245 +--
mdfour.c | 40 +-
menu.c | 40 +-
menu.h | 1 +
meshqueue.c | 6 +-
model_alias.c | 3 +-
model_brush.c | 1635 +++++++++++++-------
model_brush.h | 21 +-
model_shared.c | 32 +-
model_shared.h | 47 +-
model_sprite.c | 1 +
mvm_cmds.c | 102 +-
netconn.c | 277 +++-
netconn.h | 55 +-
palette.c | 26 +
palette.h | 2 +
progsvm.h | 16 +
protocol.c | 593 +++----
protocol.h | 2 +-
prvm_cmds.c | 102 +-
prvm_cmds.h | 10 +-
prvm_edict.c | 211 +--
prvm_exec.c | 89 +-
prvm_execprogram.h | 672 ++++----
prvm_offsets.h | 7 +
quakedef.h | 32 +-
r_explosion.c | 4 +-
r_shadow.c | 124 +-
r_textures.h | 3 +
render.h | 9 +-
sbar.c | 34 +-
screen.h | 7 +-
server.h | 17 +-
shader_glsl.h | 65 +-
shader_hlsl.h | 90 +-
snd_3dras.c | 1042 +++++++++++++
snd_3dras.h | 49 +
snd_3dras_typedefs.h | 57 +
snd_main.c | 11 +-
snd_mem.c | 15 +-
snd_mix.c | 4 +
snd_modplug.c | 432 ------
snd_modplug.h | 33 -
snd_sdl.c | 4 +-
sv_demo.c | 2 +-
sv_main.c | 70 +-
sv_move.c | 10 +-
sv_phys.c | 109 +-
sv_user.c | 34 +-
svvm_cmds.c | 25 +-
sys.h | 3 +
sys_linux.c | 2 +-
sys_sdl.c | 24 +-
sys_shared.c | 23 +-
thread_sdl.c | 4 +-
utf8lib.c | 14 +-
vid.h | 13 +
vid_agl.c | 5 +
vid_glx.c | 94 +-
vid_null.c | 5 +
vid_sdl.c | 882 ++++++++---
vid_shared.c | 51 +
vid_wgl.c | 83 +-
view.c | 11 +-
world.c | 20 +-
world.h | 9 -
zone.c | 4 +-
144 files changed, 8784 insertions(+), 4184 deletions(-)
create mode 100755 .travis-before_install-xonotic.sh
create mode 100644 .travis-id_rsa-xonotic
create mode 100755 .travis-script-xonotic.sh
create mode 100644 .travis.yml
create mode 100644 DPiOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
create mode 100644 darkplaces.cbp
create mode 100644 snd_3dras.c
create mode 100644 snd_3dras.h
create mode 100644 snd_3dras_typedefs.h
delete mode 100644 snd_modplug.c
delete mode 100644 snd_modplug.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/darkplaces.git