]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec255b5 123df62)
Merge branch 'vfs' into 'master'
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 08:54:22 +0000 (08:54 +0000)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 08:54:22 +0000 (08:54 +0000)
Some VFS fixes: attempt to load .pak and .wad, load png fallback even if game does not support png, do not load engine path twice

Closes #141 and #139

See merge request xonotic/netradiant!166


Trivial merge