Merge branch 'main' into networking

2026-08-04 09:39:41 -04:00
parent 64e95393c8
commit de8bf25fbe
50 changed files with 768 additions and 299 deletions
@@ -96,24 +96,7 @@ private:
 		eLibrary_HUD,
 		eLibrary_Tooltips,
 		eLibrary_Default,
-
-#if ( defined(_WINDOWS64) )
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
-		eLibraryFallback_Platform,
-		eLibraryFallback_GraphicsDefault,
-		eLibraryFallback_GraphicsHUD,
-		eLibraryFallback_GraphicsInGame,
-		eLibraryFallback_GraphicsTooltips,
-		eLibraryFallback_GraphicsLabels,
-		eLibraryFallback_Labels,
-		eLibraryFallback_InGame,
-		eLibraryFallback_HUD,
-		eLibraryFallback_Tooltips,
-		eLibraryFallback_Default,
-#endif
-#endif
-
+		
 		eLibrary_Count,
 	};