Merge branch 'master' into samual/combined_updates
authornyov <nyov@nexnode.net>
Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:04:46 +0000 (12:04 +1100)
commita574217154e8db48538c3ece9d941cbdc95b53a5
treed0a9afd43ad52204b6bb6b4875e5d56add6c1e5d
parentaf818d85ab5246b8ecd1743ecf808d39e4396445
Merge branch 'master' into samual/combined_updates
95 files changed:
crosshairs.cfg
defaultXonotic.cfg
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
gamemodes.cfg
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt [changed mode: 0755->0644]
gfx/menu/xaw/skinvalues.txt
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/common/counting.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/common/playerstats.qc [new file with mode: 0644]
qcsrc/common/playerstats.qh [new file with mode: 0644]
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/item/image.c
qcsrc/menu/item/textslider.c
qcsrc/menu/menu.qc
qcsrc/menu/progs.src
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/checkbox.c
qcsrc/menu/xonotic/checkbox_string.c
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/dialog_multiplayer_demo.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_join.c
qcsrc/menu/xonotic/dialog_multiplayer_media.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hudconfirm.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_profile.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings.c
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/dialog_settings_game.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_crosshair.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_hud.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_messages.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_model.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_view.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_weapons.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_misc.c
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
qcsrc/menu/xonotic/dialog_settings_user.c
qcsrc/menu/xonotic/dialog_settings_video.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/inputbox.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/screenshotimage.c [new file with mode: 0644]
qcsrc/menu/xonotic/screenshotlist.c [new file with mode: 0644]
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/slider.c
qcsrc/menu/xonotic/slider_particles.c [new file with mode: 0644]
qcsrc/menu/xonotic/slider_sbfadetime.c [new file with mode: 0644]
qcsrc/menu/xonotic/statslist.c [new file with mode: 0644]
qcsrc/menu/xonotic/textslider.c
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/mapvoting.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/playerstats.qh [deleted file]
qcsrc/server/progs.src
qcsrc/server/scores.qc
qcsrc/server/scores.qh