This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 9bedf9a825a9735664c420bd2ffa5cfb113b99d2 Merge: cf5d811 7c05199 Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Sun Dec 6 11:19:04 2015 -0500 Merge apsect correct branch 'flexible_hud' into 'master' cg_fixedAspect 0 ( Off - Default ) cg_fixedAspect 1 ( 4:3 Style HUD/UI ) cg_fixedAspect 2 ( Widescreen HUD/UI ) MP/code/cgame/cg_draw.c | 291 +++++++++++++++++++++++--- MP/code/cgame/cg_drawtools.c | 131 ++++++++++-- MP/code/cgame/cg_local.h | 9 +- MP/code/cgame/cg_main.c | 28 ++- MP/code/cgame/cg_newdraw.c | 24 +++ MP/code/cgame/cg_scoreboard.c | 30 ++- MP/code/cgame/cg_view.c | 51 +++-- MP/code/cgame/cg_weapons.c | 31 ++- MP/code/qcommon/q_shared.h | 13 ++ MP/code/ui/ui_atoms.c | 23 --- MP/code/ui/ui_local.h | 2 + MP/code/ui/ui_main.c | 94 ++++++++- MP/code/ui/ui_shared.c | 146 ++++++++++++- MP/code/ui/ui_shared.h | 6 + SP/code/cgame/cg_draw.c | 462 +++++++++++++++++++++++++++++++++--------- SP/code/cgame/cg_drawtools.c | 84 ++++++-- SP/code/cgame/cg_ents.c | 4 + SP/code/cgame/cg_info.c | 2 +- SP/code/cgame/cg_local.h | 10 +- SP/code/cgame/cg_main.c | 32 ++- SP/code/cgame/cg_newdraw.c | 39 +++- SP/code/cgame/cg_scoreboard.c | 24 ++- SP/code/cgame/cg_view.c | 51 +++-- SP/code/cgame/cg_weapons.c | 31 ++- SP/code/qcommon/q_shared.h | 13 ++ SP/code/ui/ui_atoms.c | 23 --- SP/code/ui/ui_local.h | 2 + SP/code/ui/ui_main.c | 55 ++++- SP/code/ui/ui_shared.c | 151 +++++++++++++- SP/code/ui/ui_shared.h | 6 + 30 files changed, 1539 insertions(+), 329 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits