This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository quakespasm.
commit 93b09cca14b8c517931e4e079181436e9284dd30
Merge: bb815ec 712bc6e
Author: Stephen Kitt <steve at sk2.org>
Date: Sat Nov 1 01:05:35 2014 +0100
Merge tag 'upstream/0.90.0'
Upstream version 0.90.0
gnu.txt => LICENSE.txt | 14 +-
.../{QuakeSpasm.cbp => QuakeSpasm-SDL2.cbp} | 40 +-
Linux/CodeBlocks/QuakeSpasm.cbp | 25 +-
Linux/CodeBlocks/QuakeSpasm.layout | 4 -
Linux/CodeBlocks/QuakeSpasm.workspace | 6 -
Linux/sgml/Makefile.sgml | 6 +
README.sgml => Linux/sgml/Quakespasm.sgml | 110 +-
Linux/sgml/sgml2rawtxt | 4 +
Misc/fs_search_order.patch | 37 +
Misc/gray_big.bmp | Bin 983094 -> 0 bytes
Misc/homedir_0.patch | 171 -
Misc/qs_pak/Makefile | 16 +
Misc/qs_pak/default.cfg | 110 +
Misc/qs_pak/default.cfg.orig | 98 +
Misc/{gray_big.lmp => qs_pak/gfx/conback.lmp} | Bin
Misc/qs_pak/maps/e1m1.ent | 1970 ++
Misc/qs_pak/maps/e1m1.ent.orig | 1969 ++
Misc/qs_pak/maps/e1m2.ent | 3019 +++
Misc/qs_pak/maps/e1m2.ent.orig | 3019 +++
Misc/qs_pak/maps/e2m3.ent | 2862 +++
Misc/qs_pak/maps/e2m3.ent.orig | 2860 +++
Misc/qs_pak/maps/e2m7.ent | 3633 ++++
Misc/qs_pak/maps/e2m7.ent.orig | 3632 ++++
Misc/qs_pak/mkpak.sh | 135 +
Misc/quake_retexturing_project.patch | 24 +-
Misc/snd_opus.patch | 423 -
Quake/Makefile | 78 +-
Quake/Makefile.darwin | 101 +-
Quake/Makefile.w32 | 69 +-
Quake/Makefile.w64 | 71 +-
Quake/anorm_dots.h | 616 +-
Quake/anorms.h | 360 +-
Quake/arch_def.h | 18 +-
Quake/bgmusic.c | 18 +-
Quake/bspfile.h | 93 +-
Quake/build_cross_osx-sdl2.sh | 41 +
Quake/cd_null.c | 39 +-
Quake/cd_sdl.c | 128 +-
Quake/cdaudio.h | 2 +-
Quake/cfgfile.c | 42 +-
Quake/cfgfile.h | 43 +-
Quake/chase.c | 1 +
Quake/cl_demo.c | 19 +-
Quake/cl_input.c | 23 +-
Quake/cl_main.c | 9 +-
Quake/cl_parse.c | 29 +-
Quake/cl_tent.c | 1 +
Quake/client.h | 6 +-
Quake/cmd.c | 9 +-
Quake/cmd.h | 1 +
Quake/common.c | 506 +-
Quake/common.h | 62 +-
Quake/conback.c | 34 -
Quake/conback.h | 20481 -------------------
Quake/console.c | 44 +-
Quake/console.h | 2 +-
Quake/cvar.c | 5 +-
Quake/cvar.h | 2 +-
Quake/d_ifacea.h | 105 -
Quake/draw.h | 5 +-
Quake/gl_draw.c | 103 +-
Quake/gl_fog.c | 5 +-
Quake/gl_mesh.c | 3 +-
Quake/gl_model.c | 613 +-
Quake/gl_model.h | 22 +-
Quake/gl_refrag.c | 2 +-
Quake/gl_rlight.c | 1 +
Quake/gl_rmain.c | 11 +-
Quake/gl_rmisc.c | 5 +-
Quake/gl_screen.c | 61 +-
Quake/gl_sky.c | 9 +-
Quake/gl_texmgr.c | 71 +-
Quake/gl_texmgr.h | 2 +
Quake/gl_vidsdl.c | 630 +-
Quake/gl_warp.c | 2 +-
Quake/gl_warp_sin.h | 130 +-
Quake/glquake.h | 53 +-
Quake/host.c | 4 +-
Quake/host_cmd.c | 281 +-
Quake/image.c | 90 +-
Quake/image.h | 1 +
Quake/in_sdl.c | 635 +-
Quake/input.h | 7 +-
Quake/keys.c | 333 +-
Quake/keys.h | 10 +-
Quake/main_sdl.c | 60 +-
Quake/mathlib.c | 38 +-
Quake/mathlib.h | 1 +
Quake/menu.c | 239 +-
Quake/menu.h | 5 +-
Quake/net.h | 3 +-
Quake/net_bsd.c | 1 +
Quake/net_defs.h | 49 +-
Quake/net_dgrm.c | 17 +-
Quake/net_dgrm.h | 4 +-
Quake/net_loop.c | 4 +-
Quake/net_loop.h | 2 +-
Quake/net_main.c | 10 +-
Quake/net_sdl.c | 98 -
Quake/net_sdlnet.c | 529 -
Quake/net_sdlnet.h | 44 -
Quake/net_sys.h | 37 +-
Quake/net_udp.c | 2 +-
Quake/net_udp.h | 3 +-
Quake/net_win.c | 2 +-
Quake/net_wins.c | 5 +-
Quake/net_wins.h | 4 +-
Quake/net_wipx.c | 2 +-
Quake/net_wipx.h | 4 +-
Quake/pl_linux.c | 30 +-
Quake/pl_osx.m | 5 +
Quake/pl_win.c | 13 +
Quake/platform.h | 1 +
Quake/pr_cmds.c | 5 +-
Quake/pr_comp.h | 1 +
Quake/pr_edict.c | 1 +
Quake/pr_exec.c | 1 +
Quake/progs.h | 5 +-
Quake/protocol.h | 1 +
Quake/q_ctype.h | 85 +
Quake/q_sound.h | 5 +-
Quake/q_stdinc.h | 83 +-
Quake/quakedef.h | 54 +-
Quake/quakespasm.pak | Bin 0 -> 487121 bytes
Quake/r_alias.c | 17 +-
Quake/r_brush.c | 167 +-
Quake/r_part.c | 13 +-
Quake/r_sprite.c | 3 +-
Quake/r_world.c | 528 +-
Quake/render.h | 1 +
Quake/sbar.c | 1 +
Quake/sbar.h | 1 +
Quake/screen.h | 1 +
Quake/server.h | 1 +
Quake/snd_codec.c | 81 +-
Quake/snd_codec.h | 6 +-
Quake/snd_codeci.h | 5 +-
Quake/snd_dma.c | 30 +-
Quake/snd_flac.c | 395 +
Quake/snd_flac.h | 13 +
Quake/snd_mem.c | 5 +-
Quake/snd_mikmod.c | 205 +
Quake/snd_mikmod.h | 13 +
Quake/snd_mix.c | 259 +-
Quake/snd_modplug.c | 121 +
Quake/snd_modplug.h | 12 +
Quake/snd_mp3.c | 43 +-
Quake/snd_mpg123.c | 22 +-
Quake/snd_opus.c | 210 +
Quake/snd_opus.h | 13 +
Quake/snd_sdl.c | 24 +-
Quake/snd_umx.c | 407 +
Quake/snd_umx.h | 12 +
Quake/snd_vorbis.c | 27 +-
Quake/snd_wave.c | 43 +-
Quake/sv_main.c | 14 +-
Quake/sv_move.c | 1 +
Quake/sv_phys.c | 1 +
Quake/sv_user.c | 39 +-
Quake/sys.h | 1 +
Quake/sys_sdl_unix.c | 139 +-
Quake/sys_sdl_win.c | 80 +-
Quake/vid.h | 7 +
Quake/view.c | 5 +-
Quake/view.h | 3 +-
Quake/wad.c | 1 +
Quake/wad.h | 3 +-
Quake/world.c | 1 +
Quake/world.h | 3 +-
Quake/zone.c | 5 +
Quake/zone.h | 1 +
README.music => Quakespasm-Music.txt | 2 +-
README.html => Quakespasm.html | 189 +-
README.txt => Quakespasm.txt | 259 +-
174 files changed, 30736 insertions(+), 24484 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git