]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
commit39433c4738131ac5f74ca190179668ebd59746ab
tree6a971c6aad685abb907a875db7046aae52efc8cf
parentaa61613b9fea4bb405ddb3f9ab31847993e45661
parent29d7a75c4ec9756eae0680a109a69f6980a48fea
Merge branch 'Lyberta/Survival' into Lyberta/master
qcsrc/common/items/item.qh
qcsrc/common/items/item/powerup.qh
qcsrc/common/mutators/mutator/waypoints/all.inc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/physics/player.qh