Merge remote-tracking branch 'upstream/main'

README.md

@@ -9,7 +9,7 @@ Here is how the files in this asset repository are structured:
 * `nx`, `psp`, `pc`, `vita`: These directories contain assets exclusive to their individual platforms, starting with the ['root' directory](https://en.wikipedia.org/wiki/Root_directory) for NZ:P data.
 * `source`: Contains assets sources, structured in a similar manner to the compiled paths found in `nzp/*`. 
 * `tools`: Script(s) to assist in assembling a complete archive of game assets.
-
+ 
 ## Downloading
 It is recommended that if you do not know what you are doing to use the completely set up builds found [here](https://github.com/nzp-team/nzportable).
 

pc/nzp/default.cfg

@@ -86,10 +86,7 @@ name "Unknown Soldier"
 //
 // CONTROLLER BINDS
 //
-in_xinput 1
-in_dinput 0
-in_rawinput 1
-joystick 0
+set cl_controllerglyphs "xbox"
 in_restart
 _windowed_mouse 1
 

pc/nzp/scripts/alpha_transparency.shader

@@ -6,10 +6,10 @@ models/machines/mglow$.mdl_0.lmp
     alphafunc ge128
 }
 
-models/machines/chandelier$.mdl_0.lmp
+models/props/chandelier$.mdl_0.lmp
 {
     program defaultskin
     progblendfunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-    diffusemap models/machines/mglow$.mdl_0.tga
+    diffusemap models/props/chandelier$.mdl_0.tga
     alphafunc ge128
 }