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

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

Merge branch 'master' into Mario/wepent_experimental

22 files changed:

mutators.cfg	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/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.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/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.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/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/events.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history

mutators.cfg	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/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.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/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.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/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/events.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history