Skip to content

Commit 74322c6

Browse files
Merge pull request #84 from Project-Funk-Engine/Sprint-3
Finish sprint 3!
2 parents 511be2b + 4df9a60 commit 74322c6

159 files changed

Lines changed: 3852 additions & 547 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@
99

1010

1111
.idea/.idea.Funk Engine/.idea/
12+
13+
*.DotSettings.user
14+
export_presets.cfg
-2.44 MB
Binary file not shown.

Audio/335571__magntron__gamemusic_120bpm.mp3.import

Lines changed: 0 additions & 19 deletions
This file was deleted.

Audio/Song1.ogg

1.84 MB
Binary file not shown.

Audio/Song1.ogg.import

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[remap]
2+
3+
importer="oggvorbisstr"
4+
type="AudioStreamOggVorbis"
5+
uid="uid://iq0xxe5cggs8"
6+
path="res://.godot/imported/Song1.ogg-1d785b9ae3fbaa8393048e39af66ed86.oggvorbisstr"
7+
8+
[deps]
9+
10+
source_file="res://Audio/Song1.ogg"
11+
dest_files=["res://.godot/imported/Song1.ogg-1d785b9ae3fbaa8393048e39af66ed86.oggvorbisstr"]
12+
13+
[params]
14+
15+
loop=true
16+
loop_offset=0.0
17+
bpm=0.0
18+
beat_count=0
19+
bar_beats=4

Audio/Song2.ogg

329 KB
Binary file not shown.

Audio/Song2.ogg.import

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[remap]
2+
3+
importer="oggvorbisstr"
4+
type="AudioStreamOggVorbis"
5+
uid="uid://ckis6k6vuums"
6+
path="res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"
7+
8+
[deps]
9+
10+
source_file="res://Audio/Song2.ogg"
11+
dest_files=["res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"]
12+
13+
[params]
14+
15+
loop=true
16+
loop_offset=0.0
17+
bpm=0.0
18+
beat_count=0
19+
bar_beats=4

Audio/Song3.ogg

403 KB
Binary file not shown.

Audio/Song3.ogg.import

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[remap]
2+
3+
importer="oggvorbisstr"
4+
type="AudioStreamOggVorbis"
5+
uid="uid://ceyw5mjkem2pi"
6+
path="res://.godot/imported/Song3.ogg-d4e6a5f1a550561df18989fb495ba591.oggvorbisstr"
7+
8+
[deps]
9+
10+
source_file="res://Audio/Song3.ogg"
11+
dest_files=["res://.godot/imported/Song3.ogg-d4e6a5f1a550561df18989fb495ba591.oggvorbisstr"]
12+
13+
[params]
14+
15+
loop=true
16+
loop_offset=0.0
17+
bpm=0.0
18+
beat_count=0
19+
bar_beats=4

Audio/midi/Song1.mid

791 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)