]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56f4264 ea82b59)
Merge branch 'master' into Mario/no_engine_physics
authorMario <mario.mario@y7mail.com>
Thu, 1 Dec 2022 10:50:14 +0000 (20:50 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 1 Dec 2022 10:50:14 +0000 (20:50 +1000)
1  2 
qcsrc/common/mapobjects/subs.qc patch | diff1 | diff2 | blob | history
qcsrc/common/physics/movetypes/movetypes.qc patch | diff1 | diff2 | blob | history
qcsrc/common/physics/movetypes/movetypes.qh patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/mapobjects/subs.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge