Merge remote-tracking branch 'origin/master' into maddin/map-warfare
-rw-r--r-- 4655 .gitattributes
-rw-r--r-- 37 .gitignore
drwxr-xr-x - cubemaps
drwxr-xr-x - env
drwxr-xr-x - maps
drwxr-xr-x - models
drwxr-xr-x - scripts
drwxr-xr-x - sound
drwxr-xr-x - textures