de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

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

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

author	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 3 Oct 2015 07:17:49 +0000 (17:17 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 3 Oct 2015 07:19:10 +0000 (17:19 +1000)
commit	541c234fd442f5857209128fc7a907e406f4be03
tree	eb1389fe899398fce8f01f370221d8beaf734147	tree \| snapshot
parent	0c81c3002f50a4033a9c06670bd9dd759c54c6f3	commit \| diff
parent	c0582a52156c4e74e4c5313e5f360275493a8733	commit \| diff

Merge branch 'master' into TimePath/spawnfunc

# Conflicts:
# qcsrc/common/turrets/unit/ewheel.qc
# qcsrc/common/turrets/unit/flac.qc
# qcsrc/common/turrets/unit/fusionreactor.qc
# qcsrc/common/turrets/unit/hellion.qc
# qcsrc/common/turrets/unit/hk.qc
# qcsrc/common/turrets/unit/machinegun.qc
# qcsrc/common/turrets/unit/mlrs.qc
# qcsrc/common/turrets/unit/phaser.qc
# qcsrc/common/turrets/unit/plasma.qc
# qcsrc/common/turrets/unit/plasma_dual.qc
# qcsrc/common/turrets/unit/tesla.qc
# qcsrc/common/turrets/unit/walker.qc
# qcsrc/server/t_items.qc

66 files changed:

qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/button.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/door.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/door_secret.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/pointparticles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/train.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/target/music.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/target/speaker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/gravity.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/heal.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/keylock.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/multi.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/ewheel.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/flac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/fusionreactor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/hellion.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/hk.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/mlrs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/phaser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/plasma.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/plasma_dual.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/tesla.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/bumblebee.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/_all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_domination.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/button.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/door.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/door_secret.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/pointparticles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/train.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/target/music.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/target/speaker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/gravity.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/heal.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/keylock.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/multi.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/ewheel.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/flac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/fusionreactor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/hellion.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/hk.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/mlrs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/phaser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/plasma.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/plasma_dual.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/tesla.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/unit/walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/bumblebee.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/unit/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/_all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/item_key.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_domination.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history