Merge branch 'master' into cbrutail/shaders_fx_xonotic2
-rw-r--r-- 3680 .gitattributes
-rw-r--r-- 27 .gitignore
drwxr-xr-x - env
drwxr-xr-x - maps
drwxr-xr-x - models
drwxr-xr-x - scripts
drwxr-xr-x - textures