Merge branch 'master' into levels

2021-10-04 12:37:54 -07:00 · 2021-10-04 12:37:54 -07:00 · 482dac08b9
commit 482dac08b9
parent e0cc6068da 8f8f877b6c
6 changed files with 4 additions and 0 deletions
--- a/game/assets/levels/level_1/background.png
+++ b/game/assets/levels/level_1/background.png
--- a/game/assets/levels/level_2/background.png
+++ b/game/assets/levels/level_2/background.png
--- a/game/assets/levels/level_3/background.png
+++ b/game/assets/levels/level_3/background.png
--- a/game/assets/levels/level_4/background.png
+++ b/game/assets/levels/level_4/background.png
--- a/game/assets/logos/game-logo-small-new.png
+++ b/game/assets/logos/game-logo-small-new.png
--- a/game/src/utilities/datastore.rs
+++ b/game/src/utilities/datastore.rs
@ -14,6 +14,10 @@ use tracing::debug;
 /// file so we only have to distribute a single file, instead of a game and its assets separately
 #[derive(rust_embed::RustEmbed)]
 #[folder = "assets"]
+#[exclude = "*.psd"]
+#[exclude = "*.xcf"]
+#[exclude = "*.tsx"]
+#[exclude = "*.tmx"]
 pub struct StaticGameData;

 #[derive(Debug, Error)]