]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 19 Feb 2018 08:58:31 +0000 (09:58 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 19 Feb 2018 08:58:31 +0000 (09:58 +0100)
commit6317faf49d3c92fffe52f790ff39b6792fbfe458
tree7c3a3794816a8679e93038921d506a473f678731
parent6ed2e0b406b6c0adbfbf87c3aabc58387ee0c29b
parent9157ba5777ae0125dd49a31adc856ac6be851183
Merge branch 'master' into martin-t/uncrustify
23 files changed:
qcsrc/client/view.qc
qcsrc/common/debug.qh
qcsrc/common/effects/qc/globalsound.qc
qcsrc/common/effects/qc/globalsound.qh
qcsrc/common/mapinfo.qc
qcsrc/common/notifications/all.inc
qcsrc/common/triggers/func/conveyor.qc
qcsrc/common/triggers/func/door.qc
qcsrc/common/triggers/func/door_secret.qc
qcsrc/common/triggers/func/pointparticles.qc
qcsrc/common/triggers/misc/laser.qc
qcsrc/common/triggers/misc/teleport_dest.qc
qcsrc/common/triggers/platforms.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/viewloc.qc
qcsrc/lib/warpzone/server.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/navigation.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator/gamemode_freezetag.qc
qcsrc/server/player.qc
qcsrc/server/utils.qh