]> git.xonotic.org Git - xonotic/netradiant.git/commit
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)
commit9c6a79a9f657a99b866c50816b2a129a316a05e9
tree8f591bf78ea5d86a4dcb59c370bdaebbd7d5e9df
parentec255b5639a353343c8b8b6b049839d262713480
parent123df62028030769bc34f26bf6254696f9eb41fa
Merge branch 'vfs' into 'master'

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