]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 8af36fe 18dcd00)
Merge branch 'master' into Mario/q3compat_sanity. Also store supported map features...
authorMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 06:56:06 +0000 (16:56 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 06:56:06 +0000 (16:56 +1000)
commitc43ec3808d34b0e19ce9c77e14f160e703671c0d
tree09d8062819e3777e4d738f5c0d0d64d9c7562ebatree | snapshot
parent8af36fe36bfa41c17c9bd337ebca430add66957ccommit | diff
parent18dcd0070ab608b7788a7def821088060847fa76commit | diff
Merge branch 'master' into Mario/q3compat_sanity. Also store supported map features when parsing .arena files to avoid applying them when parsing the wrong map's info
qcsrc/common/mapinfo.qc diff1 | diff2 | blob | history
qcsrc/common/mapinfo.qh diff1 | diff2 | blob | history
qcsrc/server/g_world.qc diff1 | diff2 | blob | history