Skip to content

Commit

Permalink
Merge branch 'am-music-update' of https://github.com/TinyTakinTeller/…
Browse files Browse the repository at this point in the history 
…GodotProjectZero into am-music-update
  • Loading branch information
@TinyTakinTeller
TinyTakinTeller committed Oct 1, 2024
2 parents db639bf + 857b658 commit 4604d4e
Show file tree
Hide file tree
Showing 21 changed files with 615 additions and 250 deletions.
206 changes: 103 additions & 103 deletions addons/resources_spreadsheet_view/saved_state.json
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,110 @@
{
"hidden_columns": {
"res://resources/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/enemy_data/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/event_data/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/event_data/res/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/event_data/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/npc_event/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/resource_generator/": {
"id": true,
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/resource_generator/cost_function/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/resource_generator/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/substance_data/tres/charm/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/tab_data/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/tab_data/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/worker_role/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/worker_role/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/resource_generator/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/resource_generator/res/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/theme/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/worker_role/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/worker_role/res/": {
"resource_local_to_scene": true,
"resource_name": true
}
"res://resources/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/enemy_data/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/event_data/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/event_data/res/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/event_data/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/npc_event/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/resource_generator/": {
"id": true,
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/resource_generator/cost_function/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/resource_generator/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/substance_data/tres/charm/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/tab_data/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/tab_data/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/worker_role/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/game_data/worker_role/tres/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/resource_generator/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/resource_generator/res/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/theme/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/worker_role/": {
"resource_local_to_scene": true,
"resource_name": true
},
"res://resources/worker_role/res/": {
"resource_local_to_scene": true,
"resource_name": true
}
},
"recent_paths": [
"res://resources/theme/",
"res://resources/worker_role/",
"res://resources/resource_generator/",
"res://resources/",
"res://resources/game_data/resource_generator/cost_function/",
"res://resources/game_data/tab_data/",
"res://resources/game_data/event_data/",
"res://resources/game_data/resource_generator/",
"res://resources/game_data/worker_role/",
"res://resources/game_data/event_data/tres/",
"res://resources/game_data/npc_event/tres/",
"res://resources/resource_generator/res/",
"res://resources/game_data/resource_generator/tres/",
"res://resources/game_data/worker_role/tres/",
"res://resources/worker_role/res/",
"res://resources/game_data/tab_data/tres/",
"res://resources/game_data/enemy_data/tres/",
"res://resources/game_data/event_data/res/",
"res://resources/game_data/substance_data/tres/charm/"
"res://resources/theme/",
"res://resources/worker_role/",
"res://resources/resource_generator/",
"res://resources/",
"res://resources/game_data/resource_generator/cost_function/",
"res://resources/game_data/tab_data/",
"res://resources/game_data/event_data/",
"res://resources/game_data/resource_generator/",
"res://resources/game_data/worker_role/",
"res://resources/game_data/event_data/tres/",
"res://resources/game_data/npc_event/tres/",
"res://resources/resource_generator/res/",
"res://resources/game_data/resource_generator/tres/",
"res://resources/game_data/worker_role/tres/",
"res://resources/worker_role/res/",
"res://resources/game_data/tab_data/tres/",
"res://resources/game_data/enemy_data/tres/",
"res://resources/game_data/event_data/res/",
"res://resources/game_data/substance_data/tres/charm/"
],
"table_functions": {
"filter": [
"return true"
],
"process": [
"return value"
]
"filter": [
"return true"
],
"process": [
"return value"
]
}
}
}
19 changes: 19 additions & 0 deletions assets/audio/20 Axes Arr MSTR LOOP.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://boao20b74vwfi"
path="res://.godot/imported/20 Axes Arr MSTR LOOP.mp3-f940619e5d2b0fe2acdf8de18cf8e643.mp3str"

[deps]

source_file="res://assets/audio/20 Axes Arr MSTR LOOP.mp3"
dest_files=["res://.godot/imported/20 Axes Arr MSTR LOOP.mp3-f940619e5d2b0fe2acdf8de18cf8e643.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/20 Axes Arr MSTR.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://esxco7hisjn4"
path="res://.godot/imported/20 Axes Arr MSTR.mp3-8052d34821ab7d75e7c36c2068bba6f9.mp3str"

[deps]

source_file="res://assets/audio/20 Axes Arr MSTR.mp3"
dest_files=["res://.godot/imported/20 Axes Arr MSTR.mp3-8052d34821ab7d75e7c36c2068bba6f9.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/Forest Arr MSTR LOOP.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://tksoficve1me"
path="res://.godot/imported/Forest Arr MSTR LOOP.mp3-d49adb80243c3f8f86bcd42d589cb318.mp3str"

[deps]

source_file="res://assets/audio/Forest Arr MSTR LOOP.mp3"
dest_files=["res://.godot/imported/Forest Arr MSTR LOOP.mp3-d49adb80243c3f8f86bcd42d589cb318.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/Forest Arr MSTR.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://dupl0hftpvc1d"
path="res://.godot/imported/Forest Arr MSTR.mp3-7084a65e9250e30ba686f9dee6d5e8a1.mp3str"

[deps]

source_file="res://assets/audio/Forest Arr MSTR.mp3"
dest_files=["res://.godot/imported/Forest Arr MSTR.mp3-7084a65e9250e30ba686f9dee6d5e8a1.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/Lacrimosa Arr MSTR LOOP.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://ckapo5gkwp0wk"
path="res://.godot/imported/Lacrimosa Arr MSTR LOOP.mp3-0ac175e535c1b60e74a118d3d3a9b73f.mp3str"

[deps]

source_file="res://assets/audio/Lacrimosa Arr MSTR LOOP.mp3"
dest_files=["res://.godot/imported/Lacrimosa Arr MSTR LOOP.mp3-0ac175e535c1b60e74a118d3d3a9b73f.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/Lacrimosa Arr MSTR.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://d1s187yettg14"
path="res://.godot/imported/Lacrimosa Arr MSTR.mp3-5c3a5bc1e7a6a175233290c9fae8f303.mp3str"

[deps]

source_file="res://assets/audio/Lacrimosa Arr MSTR.mp3"
dest_files=["res://.godot/imported/Lacrimosa Arr MSTR.mp3-5c3a5bc1e7a6a175233290c9fae8f303.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/Strong Chill Arr MSTR LOOP.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://b8g4auk7xg3qw"
path="res://.godot/imported/Strong Chill Arr MSTR LOOP.mp3-e0915a30e802db8434e1fc772ee0c88f.mp3str"

[deps]

source_file="res://assets/audio/Strong Chill Arr MSTR LOOP.mp3"
dest_files=["res://.godot/imported/Strong Chill Arr MSTR LOOP.mp3-e0915a30e802db8434e1fc772ee0c88f.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions assets/audio/Strong Chill Arr MSTR.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://beueo2bfr8fkt"
path="res://.godot/imported/Strong Chill Arr MSTR.mp3-c53599ff540cd575897c08b8775607c2.mp3str"

[deps]

source_file="res://assets/audio/Strong Chill Arr MSTR.mp3"
dest_files=["res://.godot/imported/Strong Chill Arr MSTR.mp3-c53599ff540cd575897c08b8775607c2.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
Loading

0 comments on commit 4604d4e

Please sign in to comment.