Merge pull request #6 from Hellzbellz123/development

update release branch with changes since v0.0.4

.gitignore

@@ -1,22 +1,19 @@
+.vscode/ra-cache
 target/
-publish/
-debug/
-/statistics/*
-*.pdb
-.vscode/settings.json
-zmainschedulegraph.dot
-zappschedule.dot
-zrenderschedule.dot
-zrendergraph.dot
-debug.log
-crates/
-gamedata/levels/homeworld32x32/backups
+package/
+
+crates/aspenlib/src/utilities/.unused_utils
+crates/desktop/debug.log
+crates/desktop/config.toml
+crates/wasm/dist
+crates/*/assets/
+assets/packs/asha/levels/aspenhallsLevelSet/backups
 Cargo.lock
+crates/*/config.toml
+crates/*/tiles.png
+crates/*/cyclic.dot
 config.toml
-gameuimockup.png~
-cyclic.dot
-tiles.png
-zschedulegraph.dot
-Cargo.lock
-cyclic.dot
-tiles.png
+debug.log
+dungeon.dot
+pathmap.dot
+pathmap.png

.gitmodules

@@ -1,11 +1,6 @@
-[submodule "deps/belly"]
-	path = deps/belly
-	url = https://github.com/jkb0o/belly.git
-	branch = bevy-0.11
 [submodule "deps/bevy"]
 	path = deps/bevy
 	url = https://github.com/bevyengine/bevy.git
-	branch = release-0.10.1
 [submodule "deps/bevy_asset_loader"]
 	path = deps/bevy_asset_loader
 	url = https://github.com/NiklasEi/bevy_asset_loader.git
@@ -33,21 +28,42 @@
 [submodule "deps/bevy_rapier"]
 	path = deps/bevy_rapier
 	url = https://github.com/dimforge/bevy_rapier.git
-[submodule "deps/bevy-console"]
-	path = deps/bevy-console
+[submodule "deps/bevy_console"]
+	path = deps/bevy_console
 	url = https://github.com/RichoDemus/bevy-console.git
-[submodule "deps/bevy-debug-text-overlay"]
-	path = deps/bevy-debug-text-overlay
+[submodule "deps/bevy_debug_text_overlay"]
+	path = deps/bevy_debug_text_overlay
 	url = https://github.com/nicopap/bevy-debug-text-overlay.git
-[submodule "deps/bevy-inspector-egui"]
-	path = deps/bevy-inspector-egui
+[submodule "deps/bevy_inspector_egui"]
+	path = deps/bevy_inspector_egui
 	url = https://github.com/jakobhellermann/bevy-inspector-egui.git
-[submodule "deps/big-brain"]
-	path = deps/big-brain
+[submodule "deps/big_brain"]
+	path = deps/big_brain
 	url = https://github.com/zkat/big-brain
-[submodule "deps/leafwing-input-manager"]
-	path = deps/leafwing-input-manager
+[submodule "deps/bevy_egui"]
+	path = deps/bevy_egui
+	url = https://github.com/mvlabat/bevy_egui.git
+[submodule "deps/leafwing_input_manager"]
+	path = deps/leafwing_input_manager
 	url = https://github.com/Leafwing-Studios/leafwing-input-manager
 [submodule "deps/seldom_map_nav"]
 	path = deps/seldom_map_nav
 	url = https://github.com/Seldom-SE/seldom_map_nav.git
+[submodule "deps/bevy_eventlistener"]
+	path = deps/bevy_eventlistener
+	url = https://github.com/aevyrie/bevy_eventlistener.git
+[submodule "deps/bevy_mod_picking"]
+	path = deps/bevy_mod_picking
+	url = https://github.com/aevyrie/bevy_mod_picking.git
+[submodule "deps/iyes_progress"]
+	path = deps/iyes_progress
+	url = https://github.com/IyesGames/iyes_progress.git
+[submodule "deps/bevy_touch_stick"]
+	path = deps/bevy_touch_stick
+	url = https://github.com/johanhelsing/bevy_touch_stick.git
+[submodule "deps/bevy_mod_logfu"]
+	path = deps/bevy_mod_logfu
+	url = https://github.com/Hellzbellz123/bevy_mod_logfu.git
+[submodule "deps/bevy_aseprite_ultra"]
+	path = deps/bevy_aseprite_ultra
+	url = https://github.com/Lommix/bevy_aseprite_ultra.git

.trunk/.gitignore

@@ -2,6 +2,8 @@
 *logs
 *actions
 *notifications
+*tools
 plugins
 user_trunk.yaml
 user.yaml
+tmp

.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: true
+bullet: true
+html: true
+indentation: true
+line_length: true
+spaces: true
+url: true
+whitespace: true

.trunk/configs/.yamllint.yaml

@@ -0,0 +1,10 @@
+rules:
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  empty-values:
+    forbid-in-block-mappings: true
+    forbid-in-flow-mappings: true
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true

.trunk/trunk.yaml

@@ -1,41 +1,46 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
-runtimes:
-  enabled:
-    - [email protected]
-    - [email protected]
+cli:
+  version: 1.22.7
 plugins:
   sources:
     - id: trunk
-      ref: v0.0.14
+      ref: v1.6.4
       uri: https://github.com/trunk-io/plugins
-cli:
-  version: 1.8.1
+runtimes:
+  enabled:
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
 lint:
+  disabled:
+    - rustfmt
+    - clippy
   enabled:
-    - [email protected]
-    - clippy@SYSTEM
-    - git-diff-check@SYSTEM
-    - [email protected]
-    - [email protected]
-    - [email protected]
-    - rustfmt@SYSTEM
-    - [email protected]
-    - [email protected]
-    - [email protected]
-
-  # definitions:
-  #   - name: clippy
-  #     type: clippy
-  #     files:
-  #       - rust
-  #     command:
-  #       - cargo
-  #       - clippy
-  #       - --message-format
-  #       - json
-  #       - --no-deps
+    - git-diff-check
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+  ignore:
+    - linters: [ALL]
+      paths:
+        # ignore dependencies
+        - deps
 actions:
-  enabled:
+  disabled:
+    - git-lfs
     - trunk-announce
     - trunk-check-pre-push
     - trunk-fmt-pre-commit

.vscode/launch.json

@@ -6,36 +6,27 @@
   "configurations": [
     {
       "type": "lldb",
-      "request": "launch",
-      "name": "Debug executable 'vanillacoffee'",
-      "cargo": {
-        "args": ["build", "--bin=vanillacoffee", "--package=vanillacoffee"],
-        "filter": {
-          "name": "vanillacoffee",
-          "kind": "bin"
-        }
-      },
-      "args": [],
-      "cwd": "${workspaceFolder}"
+      "request": "attach",
+      "name": "Attach",
+      "program": "${workspaceFolder}/target/debug/aspen_halls_desktop"
     },
     {
       "type": "lldb",
       "request": "launch",
-      "name": "Debug linux executable 'vanillacoffee'",
+      "name": "Build and Debug 'Aspen Halls Native'",
       "cargo": {
         "args": [
           "build",
-          "--target=x86_64-unknown-linux-gnu",
-          "--bin=vanillacoffee",
-          "--package=vanillacoffee"
+          "--bin=aspen_halls_desktop",
+          "--package=aspen_halls_desktop"
         ],
         "filter": {
-          "name": "vanillacoffee",
+          "name": "aspen_halls_desktop",
           "kind": "bin"
         }
       },
       "args": [],
-      "cwd": "${workspaceFolder}"
+      "cwd": "${workspaceFolder}/crates/desktop"
     }
   ]
 }