Merge branch 'main' of github.com:huoshenlaile/cs4152

Icasia-Rainstorm · May 3, 2024 · 9dc6b09 · 9dc6b09
2 parents c51ba5b + 61e6db2
commit 9dc6b09
Show file tree

Hide file tree

Showing 5 changed files with 3,305 additions and 2,087 deletions.
diff --git a/assets/json/assets.json b/assets/json/assets.json
@@ -23,6 +23,9 @@
         "staticplatform_comet": {
             "file": "textures/staticplatform_comet.png"
         },
+        "smoothplatform_comet": {
+            "file": "textures/movingplatform_comet.png"
+        },
         "bouncingplatform_slime": {
             "file": "textures/bouncingplatform_slime.png"
         },