develop #50

Merged
cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00
4 changed files with 16 additions and 16 deletions
Showing only changes of commit 6c0b656d79 - Show all commits

View File

@ -1,15 +0,0 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/Magic Fx 7.ogg-8a3ae422bac9ed88f48079377b8e81ff.oggstr"
[deps]
source_file="res://assets/music/Magic Fx 7.ogg"
dest_files=[ "res://.import/Magic Fx 7.ogg-8a3ae422bac9ed88f48079377b8e81ff.oggstr" ]
[params]
loop=true
loop_offset=0

View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/prototype_r.ogg-fe1f80b61f2acb1c2ae620457cf8aac9.oggstr"
[deps]
source_file="res://assets/music/prototype_r.ogg"
dest_files=[ "res://.import/prototype_r.ogg-fe1f80b61f2acb1c2ae620457cf8aac9.oggstr" ]
[params]
loop=true
loop_offset=0

View File

@ -6,7 +6,7 @@
[ext_resource path="res://assets/backgrounds/mountains.png" type="Texture" id=4] [ext_resource path="res://assets/backgrounds/mountains.png" type="Texture" id=4]
[ext_resource path="res://collectables/coin/Coin.tscn" type="PackedScene" id=5] [ext_resource path="res://collectables/coin/Coin.tscn" type="PackedScene" id=5]
[ext_resource path="res://hud/CoinHUD.tscn" type="PackedScene" id=6] [ext_resource path="res://hud/CoinHUD.tscn" type="PackedScene" id=6]
[ext_resource path="res://assets/music/Magic Fx 7.ogg" type="AudioStream" id=7] [ext_resource path="res://assets/music/prototype_r.ogg" type="AudioStream" id=7]
[ext_resource path="res://goal/Goal.tscn" type="PackedScene" id=8] [ext_resource path="res://goal/Goal.tscn" type="PackedScene" id=8]
[node name="Prototype" type="Node2D"] [node name="Prototype" type="Node2D"]