From ad156071c65e8e561626c07f3ac699cf4650e22e Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 15:00:08 +1100 Subject: [PATCH 1/6] Added collider to death sprites --- Assets/Art Assets/Tiles/Environment/Death/Poison.asset | 2 +- Assets/Art Assets/Tiles/Environment/Death/Spikes.asset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Art Assets/Tiles/Environment/Death/Poison.asset b/Assets/Art Assets/Tiles/Environment/Death/Poison.asset index 00dd788..9698c2f 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Poison.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Poison.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57ee9c5b334424f0ec080808ba66c60e1558396400e3919261bc04991479db9c +oid sha256:26d48b195ab346b82a2d2352956909a8089228ff55f95e3bd641006b7433a596 size 943 diff --git a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset index e462b74..594c8db 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00ebc50e827fb82f30372c24bd12e6a4b2173d87ccd9541bb7f890f8367a224d +oid sha256:8d3de62af4f63e8faf7d11c4975ce1611a2ad187657d33aac30866e690a7a483 size 1029 From 8326b80e09d27967e901a39a8926f6e9a099588d Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 15:01:38 +1100 Subject: [PATCH 2/6] Changed animation speed of spike --- Assets/Art Assets/Tiles/Environment/Death/Spikes.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset index 594c8db..5eaabef 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d3de62af4f63e8faf7d11c4975ce1611a2ad187657d33aac30866e690a7a483 +oid sha256:7115e8cfd7fc0cb5474dba5a48e8ac07a96c34eefd9aa2fd259bc0db4b26232f size 1029 From 15b07d201cc2eecb43239918812f2fba45bad50f Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 15:02:47 +1100 Subject: [PATCH 3/6] Added clouds to menu --- Assets/Scenes/Main Menu.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 26485d8..e80a91a 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6bb170350f51223f69cf120f4080fafacdda47ff42f1c7272af410c086c4da1 -size 43905 +oid sha256:f7a3e7826e8957475e728b4df8a2463142eb7d79f49ff3a86ba9b72d83d858de +size 50576 From 6e478c297bb4077ce1672bd327cd0b36434e6558 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 15:05:57 +1100 Subject: [PATCH 4/6] Made ui buttons transperent --- Assets/Scenes/Credits.unity | 4 ++-- Assets/Scenes/Main Menu.unity | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity index 22f77bd..75392c0 100644 --- a/Assets/Scenes/Credits.unity +++ b/Assets/Scenes/Credits.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9acdfc570ba1dd93dd1993e4433761839dfcfadee2628db44593e59ea48748b9 -size 43503 +oid sha256:f1293c746b47bfa5f2e9108aeac4fb2da195efc4f12d231869772e262972df55 +size 43780 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index e80a91a..0737129 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7a3e7826e8957475e728b4df8a2463142eb7d79f49ff3a86ba9b72d83d858de +oid sha256:2a2fa9ffad2a6eba08e099734d8bc33fe234160c3ea40c718e71d704d605eedf size 50576 From 3cebe38265fe88b41b679d283ca95849bbfe6044 Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 15:12:02 +1100 Subject: [PATCH 5/6] Ported Level 1 --- Assets/Scenes/Official Levels/Level 1.unity | 3 +++ Assets/Scenes/Official Levels/Level 1.unity.meta | 7 +++++++ ProjectSettings/EditorBuildSettings.asset | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Assets/Scenes/Official Levels/Level 1.unity create mode 100644 Assets/Scenes/Official Levels/Level 1.unity.meta diff --git a/Assets/Scenes/Official Levels/Level 1.unity b/Assets/Scenes/Official Levels/Level 1.unity new file mode 100644 index 0000000..0615b86 --- /dev/null +++ b/Assets/Scenes/Official Levels/Level 1.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63c0ed5eaf32aba0f5271388122c2d3cc51a2c0ebe9612ddb48066b1cafcdfd6 +size 171848 diff --git a/Assets/Scenes/Official Levels/Level 1.unity.meta b/Assets/Scenes/Official Levels/Level 1.unity.meta new file mode 100644 index 0000000..6bbe33f --- /dev/null +++ b/Assets/Scenes/Official Levels/Level 1.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a4dec0d5a76feec4182e1055229d025f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c8cb216..7d43239 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9682480db3ebe03db4da8aa453bf7de1e9a980f644f11c617f9e80c8e75de1f -size 516 +oid sha256:64a2ebad89d335695c6917690005d907bbee1e78c7e77f4622fe39f3130ada56 +size 532 From cbd5ad2d6eec05ced8ba13fa4c2e9d0f77f0bb9c Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 15:34:49 +1100 Subject: [PATCH 6/6] Official level 2 --- Assets/Scenes/Official Levels/Level 2.unity | 3 +++ Assets/Scenes/Official Levels/Level 2.unity.meta | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 Assets/Scenes/Official Levels/Level 2.unity create mode 100644 Assets/Scenes/Official Levels/Level 2.unity.meta diff --git a/Assets/Scenes/Official Levels/Level 2.unity b/Assets/Scenes/Official Levels/Level 2.unity new file mode 100644 index 0000000..4650ab8 --- /dev/null +++ b/Assets/Scenes/Official Levels/Level 2.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b0d3ea3b31b04772615a1fc7e0297797664d701fb378e135c3a00422745cb73 +size 1961456 diff --git a/Assets/Scenes/Official Levels/Level 2.unity.meta b/Assets/Scenes/Official Levels/Level 2.unity.meta new file mode 100644 index 0000000..f9dee5f --- /dev/null +++ b/Assets/Scenes/Official Levels/Level 2.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5599076f95571e040bd17f30d94a88d0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: