git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

author	nyov <nyov@nexnode.net>
	Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 14 Dec 2014 01:04:46 +0000 (12:04 +1100)
commit	a574217154e8db48538c3ece9d941cbdc95b53a5
tree	d0a9afd43ad52204b6bb6b4875e5d56add6c1e5d	tree \| snapshot
parent	af818d85ab5246b8ecd1743ecf808d39e4396445	commit \| diff

Merge branch 'master' into samual/combined_updates

95 files changed:

crosshairs.cfg		diff \| blob \| history
defaultXonotic.cfg		diff \| blob \| history
effects-high.cfg		diff \| blob \| history
effects-low.cfg		diff \| blob \| history
effects-med.cfg		diff \| blob \| history
effects-normal.cfg		diff \| blob \| history
effects-omg.cfg		diff \| blob \| history
effects-ultimate.cfg		diff \| blob \| history
effects-ultra.cfg		diff \| blob \| history
gamemodes.cfg		diff \| blob \| history
gfx/menu/luminos/skinvalues.txt		diff \| blob \| history
gfx/menu/wickedx/skinvalues.txt	[changed mode: 0755->0644]	diff \| blob \| history
gfx/menu/xaw/skinvalues.txt		diff \| blob \| history
qcsrc/client/View.qc		diff \| blob \| history
qcsrc/client/autocvars.qh		diff \| blob \| history
qcsrc/client/progs.src		diff \| blob \| history
qcsrc/common/counting.qh		diff \| blob \| history
qcsrc/common/mapinfo.qc		diff \| blob \| history
qcsrc/common/mapinfo.qh		diff \| blob \| history
qcsrc/common/notifications.qh		diff \| blob \| history
qcsrc/common/playerstats.qc	[new file with mode: 0644]	blob
qcsrc/common/playerstats.qh	[new file with mode: 0644]	blob
qcsrc/common/util.qc		diff \| blob \| history
qcsrc/common/util.qh		diff \| blob \| history
qcsrc/menu/classes.c		diff \| blob \| history
qcsrc/menu/item/image.c		diff \| blob \| history
qcsrc/menu/item/textslider.c		diff \| blob \| history
qcsrc/menu/menu.qc		diff \| blob \| history
qcsrc/menu/progs.src		diff \| blob \| history
qcsrc/menu/skin-customizables.inc		diff \| blob \| history
qcsrc/menu/xonotic/checkbox.c		diff \| blob \| history
qcsrc/menu/xonotic/checkbox_string.c		diff \| blob \| history
qcsrc/menu/xonotic/demolist.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_multiplayer.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_demo.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_join.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_media.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hudconfirm.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c	[deleted file]	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_profile.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_audio.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_effects.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_game.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_crosshair.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_hud.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_messages.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_model.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_view.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_game_weapons.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/dialog_settings_input.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_misc.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_user.c		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_video.c		diff \| blob \| history
qcsrc/menu/xonotic/gametypelist.c		diff \| blob \| history
qcsrc/menu/xonotic/inputbox.c		diff \| blob \| history
qcsrc/menu/xonotic/mainwindow.c		diff \| blob \| history
qcsrc/menu/xonotic/screenshotimage.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/screenshotlist.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/serverlist.c		diff \| blob \| history
qcsrc/menu/xonotic/slider.c		diff \| blob \| history
qcsrc/menu/xonotic/slider_particles.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/slider_sbfadetime.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/statslist.c	[new file with mode: 0644]	blob
qcsrc/menu/xonotic/textslider.c		diff \| blob \| history
qcsrc/menu/xonotic/util.qc		diff \| blob \| history
qcsrc/menu/xonotic/util.qh		diff \| blob \| history
qcsrc/server/autocvars.qh		diff \| blob \| history
qcsrc/server/cl_client.qc		diff \| blob \| history
qcsrc/server/cl_player.qc		diff \| blob \| history
qcsrc/server/command/vote.qc		diff \| blob \| history
qcsrc/server/defs.qh		diff \| blob \| history
qcsrc/server/g_damage.qc		diff \| blob \| history
qcsrc/server/g_world.qc		diff \| blob \| history
qcsrc/server/mapvoting.qc		diff \| blob \| history
qcsrc/server/miscfunctions.qc		diff \| blob \| history
qcsrc/server/playerstats.qh	[deleted file]	blob \| history
qcsrc/server/progs.src		diff \| blob \| history
qcsrc/server/scores.qc		diff \| blob \| history
qcsrc/server/scores.qh		diff \| blob \| history

RSS Atom