Skip to content

Commit

Permalink
Merge pull request #21 from ShadowMario/ShadowMario-patch-1
Browse files Browse the repository at this point in the history
Stuff
  • Loading branch information
ShadowMario committed Sep 1, 2021
2 parents 019681e + 3710e68 commit c115174
Show file tree
Hide file tree
Showing 70 changed files with 3,130 additions and 168 deletions.
28 changes: 0 additions & 28 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,38 +56,24 @@
<library name="songs" preload="true" />
<library name="shared" preload="true" />
<library name="tutorial" preload="true" />
<library name="tutorial_high" preload="true" />
<library name="week1" preload="true" />
<library name="week1_high" preload="true" />
<library name="week2" preload="true" />
<library name="week2_high" preload="true" />
<library name="week3" preload="true" />
<library name="week3_high" preload="true" />
<library name="week4" preload="true" />
<library name="week4_high" preload="true" />
<library name="week5" preload="true" />
<library name="week5_high" preload="true" />
<library name="week6" preload="true" />
<library name="week6_high" preload="true" />
</section>

<section if="NO_PRELOAD_ALL">
<library name="songs" preload="false" />
<library name="shared" preload="false" />
<library name="tutorial" preload="false" />
<library name="tutorial_high" preload="false" />
<library name="week1" preload="false" />
<library name="week1_high" preload="false" />
<library name="week2" preload="false" />
<library name="week2_high" preload="false" />
<library name="week3" preload="false" />
<library name="week3_high" preload="false" />
<library name="week4" preload="false" />
<library name="week4_high" preload="false" />
<library name="week5" preload="false" />
<library name="week5_high" preload="false" />
<library name="week6" preload="false" />
<library name="week6_high" preload="false" />
</section>

<assets path="assets/songs" library="songs" exclude="*.ogg" if="web"/>
Expand All @@ -96,32 +82,18 @@
<assets path="assets/shared" library="shared" exclude="*.mp3" unless="web"/>
<assets path="assets/tutorial" library="tutorial" exclude="*.ogg" if="web"/>
<assets path="assets/tutorial" library="tutorial" exclude="*.mp3" unless="web"/>
<assets path="assets/tutorial_high" library="tutorial_high" exclude="*.ogg" if="web"/>
<assets path="assets/tutorial_high" library="tutorial_high" exclude="*.mp3" unless="web"/>
<assets path="assets/week1" library="week1" exclude="*.ogg" if="web"/>
<assets path="assets/week1" library="week1" exclude="*.mp3" unless="web"/>
<assets path="assets/week1_high" library="week1_high" exclude="*.ogg" if="web"/>
<assets path="assets/week1_high" library="week1_high" exclude="*.mp3" unless="web"/>
<assets path="assets/week2" library="week2" exclude="*.ogg" if="web"/>
<assets path="assets/week2" library="week2" exclude="*.mp3" unless="web"/>
<assets path="assets/week2_high" library="week2_high" exclude="*.ogg" if="web"/>
<assets path="assets/week2_high" library="week2_high" exclude="*.mp3" unless="web"/>
<assets path="assets/week3" library="week3" exclude="*.ogg" if="web"/>
<assets path="assets/week3" library="week3" exclude="*.mp3" unless="web"/>
<assets path="assets/week3_high" library="week3_high" exclude="*.ogg" if="web"/>
<assets path="assets/week3_high" library="week3_high" exclude="*.mp3" unless="web"/>
<assets path="assets/week4" library="week4" exclude="*.ogg" if="web"/>
<assets path="assets/week4" library="week4" exclude="*.mp3" unless="web"/>
<assets path="assets/week4_high" library="week4_high" exclude="*.ogg" if="web"/>
<assets path="assets/week4_high" library="week4_high" exclude="*.mp3" unless="web"/>
<assets path="assets/week5" library="week5" exclude="*.ogg" if="web"/>
<assets path="assets/week5" library="week5" exclude="*.mp3" unless="web"/>
<assets path="assets/week5_high" library="week5_high" exclude="*.ogg" if="web"/>
<assets path="assets/week5_high" library="week5_high" exclude="*.mp3" unless="web"/>
<assets path="assets/week6" library="week6" exclude="*.ogg" if="web"/>
<assets path="assets/week6" library="week6" exclude="*.mp3" unless="web"/>
<assets path="assets/week6_high" library="week6_high" exclude="*.ogg" if="web"/>
<assets path="assets/week6_high" library="week6_high" exclude="*.mp3" unless="web"/>

<assets path='example_mods' rename='mods' embed='false' if="MODS_ALLOWED"/>
<assets path='art/readme.txt' rename='do NOT readme.txt' />
Expand Down
203 changes: 202 additions & 1 deletion assets/preload/characters/bf-car.json
Original file line number Diff line number Diff line change
@@ -1 +1,202 @@
{"animations":[{"offsets":[-5,0],"loop":false,"fps":24,"anim":"idle","indices":[],"name":"BF idle dance"},{"offsets":[12,-6],"loop":false,"fps":24,"anim":"singLEFT","indices":[],"name":"BF NOTE LEFT0"},{"offsets":[-10,-50],"loop":false,"fps":24,"anim":"singDOWN","indices":[],"name":"BF NOTE DOWN0"},{"offsets":[-29,27],"loop":false,"fps":24,"anim":"singUP","indices":[],"name":"BF NOTE UP0"},{"offsets":[-38,-7],"loop":false,"fps":24,"anim":"singRIGHT","indices":[],"name":"BF NOTE RIGHT0"},{"offsets":[12,24],"loop":false,"fps":24,"anim":"singLEFTmiss","indices":[],"name":"BF NOTE LEFT MISS"},{"offsets":[-11,-19],"loop":false,"fps":24,"anim":"singDOWNmiss","indices":[],"name":"BF NOTE DOWN MISS"},{"offsets":[-29,27],"loop":false,"fps":24,"anim":"singUPmiss","indices":[],"name":"BF NOTE UP MISS"},{"offsets":[-30,21],"loop":false,"fps":24,"anim":"singRIGHTmiss","indices":[],"name":"BF NOTE RIGHT MISS"},{"offsets":[-5,0],"loop":true,"anim":"idleHair","fps":24,"name":"BF idle dance","indices":[10,11,12,13]}],"no_antialiasing":false,"image":"characters/bfCar","position":[0,350],"healthicon":"bf","flip_x":true,"camera_position":[0,0],"sing_duration":4,"scale":1}
{
"animations": [
{
"offsets": [
0,
0
],
"loop": false,
"fps": 24,
"anim": "idle",
"indices": [],
"name": "BF idle dance"
},
{
"offsets": [
12,
-6
],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"indices": [],
"name": "BF NOTE LEFT0"
},
{
"offsets": [
-10,
-50
],
"loop": false,
"fps": 24,
"anim": "singDOWN",
"indices": [],
"name": "BF NOTE DOWN0"
},
{
"offsets": [
-29,
27
],
"loop": false,
"fps": 24,
"anim": "singUP",
"indices": [],
"name": "BF NOTE UP0"
},
{
"offsets": [
-38,
-7
],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"indices": [],
"name": "BF NOTE RIGHT0"
},
{
"offsets": [
12,
24
],
"loop": false,
"fps": 24,
"anim": "singLEFTmiss",
"indices": [],
"name": "BF NOTE LEFT MISS"
},
{
"offsets": [
-11,
-19
],
"loop": false,
"fps": 24,
"anim": "singDOWNmiss",
"indices": [],
"name": "BF NOTE DOWN MISS"
},
{
"offsets": [
-29,
27
],
"loop": false,
"fps": 24,
"anim": "singUPmiss",
"indices": [],
"name": "BF NOTE UP MISS"
},
{
"offsets": [
-30,
21
],
"loop": false,
"fps": 24,
"anim": "singRIGHTmiss",
"indices": [],
"name": "BF NOTE RIGHT MISS"
},
{
"offsets": [
0,
0
],
"indices": [
10,
11,
12,
13
],
"fps": 24,
"anim": "idle-loop",
"loop": true,
"name": "BF idle dance"
},
{
"offsets": [
12,
-6
],
"indices": [
12,
13,
14,
15
],
"fps": 24,
"anim": "singLEFT-loop",
"loop": true,
"name": "BF NOTE LEFT0"
},
{
"offsets": [
-38,
-7
],
"indices": [
58,
59,
60,
61
],
"fps": 24,
"anim": "singRIGHT-loop",
"loop": true,
"name": "BF NOTE RIGHT0"
},
{
"offsets": [
-29,
27
],
"indices": [
11,
12,
13,
14
],
"fps": 24,
"anim": "singUP-loop",
"loop": true,
"name": "BF NOTE UP0"
},
{
"offsets": [
-10,
-50
],
"indices": [
26,
27,
28,
29
],
"fps": 24,
"anim": "singDOWN-loop",
"loop": true,
"name": "BF NOTE DOWN0"
}
],
"no_antialiasing": false,
"image": "characters/bfCar",
"position": [
0,
350
],
"healthicon": "bf",
"flip_x": true,
"healthbar_colors": [
49,
176,
209
],
"camera_position": [
0,
0
],
"sing_duration": 4,
"scale": 1
}
Loading

0 comments on commit c115174

Please sign in to comment.