merge with main

This commit is contained in:
2021-12-08 23:06:13 -06:00
106 changed files with 1735 additions and 1277 deletions

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Levels/Objects/icekey.png" type="Texture" id=1]
[ext_resource path="res://Levels/Objects/Gem.gd" type="Script" id=2]
[ext_resource path="res://Levels/Interactables/Gem.gd" type="Script" id=2]
[sub_resource type="Animation" id=1]
resource_name = "rise"