feat: mg34

buxx · May 24, 2024 · 305b40c · 305b40c
1 parent 39babf5
commit 305b40c
Show file tree

Hide file tree

Showing 52 changed files with 1,514 additions and 1,739 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -175,7 +175,8 @@
                 "--side-a-control",
                 "SW",
                 "--side-b-control",
-                "ALL"
+                "ALL",
+                "--init-sync"
             ],
             "cwd": "${workspaceFolder}",
             "env": {
@@ -1312,5 +1313,27 @@
                 "RUST_BACKTRACE": "1"
             }
         },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "mg34 --release",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=mg34",
+                    "--package=examples",
+                    "--release"
+                ],
+                "filter": {
+                    "name": "mg34",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "RUST_BACKTRACE": "1"
+            }
+        },
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,6 +37,8 @@
                 "ocbs",
                 "opencombat",
                 "pathfinding",
+                "Patronengurt",
+                "Patronengurtx",
                 "recv",
                 "rstest",
                 "rustbuild",

diff --git a/CREDITS b/CREDITS
@@ -18,6 +18,8 @@ BulletWallImpact1 : https://freesound.org/people/toxicwafflezz/sounds/150838/
 BulletGroundImpact1 : https://freesound.org/people/toxicwafflezz/sounds/150839/
 Bren : Clean Machine Gun Burst by qubodup -- https://freesound.org/s/482122/
 ReloadGeneric1 : Chambering 1 by magnuswaker -- https://freesound.org/s/523058/
+Bren photo: https://en.wikipedia.org/wiki/File:8th_Royal_Scots_halted_27-10-1944.jpg
+mg34 photo: https://en.wikipedia.org/wiki/File:Walki_uliczne_we_wsi_na_froncie_wschodnim_(2-1008).jpg
 
 Map sources : 
   - Grass : p0ss https://opengameart.org/node/9717

diff --git a/assets/demo1_deployment.json b/assets/demo1_deployment.json
@@ -2114,5 +2114,6 @@
         }
     ],
     "vehicles": [],
-    "boards": {}
+    "boards": {},
+    "squad_types": {}
 }