Merge branch 'master' into windows

2026-08-07 17:29:36 +00:00 · 2022-07-27 12:58:56 +03:00
parent edbe1baceb a53fff833f
commit 90cd6e0e15
3089 changed files with 38639 additions and 844820 deletions
@@ -4,7 +4,6 @@
 *.vpc.*
 *.project
 *obj_*
-build/
 .waf*
 .lock-waf*
 __pycache__
@@ -29,4 +28,11 @@ Release_*/
 *.ilk
 ValveETWProviderEvents.h
 game/client/*/client.lib
-game/server/*/server.lib
+game/server/*/server.lib
+.DS_Store
+build*/
+android/
+.cache/
+.ccache/
+waf3*/
+.vscode/