Skip to content

Commit

Permalink
v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Denoohay
Denoohay committed Nov 10, 2024
1 parent 3593bbe commit 9983a95
Show file tree
Hide file tree
Showing 176 changed files with 8,971 additions and 42,918 deletions.
2 changes: 0 additions & 2 deletions assets/exclude/data/ui/chart-editor/components/playbar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
<button allowFocus="false" styleName="playbarButton" tooltip="Skip to End" id="playbarEnd" text=">|" />
</hbox>
<hbox horizontalAlign="right">
<label id="currentTimeLabel" verticalAlign="center" text="Time: 0" styleName="playbarStatus" />
<rule direction="vertical" height="80%" />
<label id="playbarDifficulty" verticalAlign="center" text="NORMAL" styleName="playbarStatus" tooltip="Left Click/Ctrl+Left Arrow to Decrease Difficulty\nRight Click/Ctrl+Right Arrow to Increase Difficulty\nCtrl+Click to open Difficulty Window" />
<rule direction="vertical" height="80%" />
<label id="playbarBPM" verticalAlign="center" text="BPM: 120" styleName="playbarStatus" tooltip="Left Click to Increase BPM\nRight Click to Decrease BPM\nCtrl+Click to open Metadata Window" />
Expand Down
35 changes: 35 additions & 0 deletions assets/preload/data/characters/dad.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,60 @@
"prefix": "dad idle",
"offsets": [0, 0]
},
{
"name": "idle-hold",
"prefix": "dad idle",
"frameIndices": [11, 12, 13, 14],
"looped": true,
"offsets": [0, 0]
},
{
"name": "singLEFT",
"prefix": "left",
"offsets": [120, -31]
},
{
"name": "singLEFT-hold",
"prefix": "left",
"frameIndices": [11, 12, 13, 14],
"looped": true,
"offsets": [120, -31]
},
{
"name": "singDOWN",
"prefix": "down",
"offsets": [185, -187]
},
{
"name": "singDOWN-hold",
"prefix": "down",
"frameIndices": [12, 13, 14, 15],
"looped": true,
"offsets": [185, -187]
},
{
"name": "singUP",
"prefix": "up",
"offsets": [58, 10]
},
{
"name": "singUP-hold",
"prefix": "up",
"frameIndices": [12, 13, 14, 15],
"looped": true,
"offsets": [58, 10]
},
{
"name": "singRIGHT",
"prefix": "right",
"offsets": [22, -73]
},
{
"name": "singRIGHT-hold",
"prefix": "right",
"frameIndices": [11, 12, 13, 14],
"looped": true,
"offsets": [22, -73]
}
]
}
2 changes: 1 addition & 1 deletion assets/preload/data/characters/moloch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"name": "singRIGHT",
"prefix": "moloch right",
"assetPath": "characters/moloch/poses",
"offsets": [0, 2]
"offsets": [0, -10]
},
{
"name": "singUP",
Expand Down
2 changes: 1 addition & 1 deletion assets/preload/data/characters/pump-opponent-dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{
"name": "cheer",
"prefix": "pumpCheer",
"offsets": [58, -42]
"offsets": [92, -1]
}
]
}
2 changes: 1 addition & 1 deletion assets/preload/data/characters/pump-opponent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{
"name": "cheer",
"prefix": "pumpCheer",
"offsets": [58, -42]
"offsets": [92, -1]
}
]
}
2 changes: 1 addition & 1 deletion assets/preload/data/characters/pump-playable-dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{
"name": "cheer",
"prefix": "pumpCheer",
"offsets": [40, -38]
"offsets": [64, -4]
},
{
"name": "firstDeath",
Expand Down
2 changes: 1 addition & 1 deletion assets/preload/data/characters/pump-playable.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{
"name": "cheer",
"prefix": "pumpCheer",
"offsets": [40, -38]
"offsets": [64, -4]
},
{
"name": "firstDeath",
Expand Down
6 changes: 3 additions & 3 deletions assets/preload/data/characters/skid-opponent-dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
{
"name": "singLEFT",
"prefix": "skidRight",
"offsets": [82, -17]
"offsets": [55, -17]
},
{
"name": "singDOWN",
"prefix": "skidDown",
"offsets": [-5, -35]
"offsets": [-5, -41]
},
{
"name": "singUP",
"prefix": "skidUp",
"offsets": [-2, 61]
"offsets": [-12, 42]
},
{
"name": "singRIGHT",
Expand Down
6 changes: 3 additions & 3 deletions assets/preload/data/characters/skid-opponent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
{
"name": "singLEFT",
"prefix": "skidRight",
"offsets": [82, -17]
"offsets": [55, -17]
},
{
"name": "singDOWN",
"prefix": "skidDown",
"offsets": [-5, -35]
"offsets": [-5, -41]
},
{
"name": "singUP",
"prefix": "skidUp",
"offsets": [-2, 61]
"offsets": [-12, 42]
},
{
"name": "singRIGHT",
Expand Down
18 changes: 9 additions & 9 deletions assets/preload/data/characters/skid-playable-dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,47 +19,47 @@
{
"name": "singLEFT",
"prefix": "skidLeft",
"offsets": [33, -1]
"offsets": [31, 1]
},
{
"name": "singLEFTmiss",
"prefix": "skidMISSleft",
"offsets": [27, 19]
"offsets": [31, 20]
},
{
"name": "singDOWN",
"prefix": "skidDown",
"offsets": [23, -31]
"offsets": [23, -40]
},
{
"name": "singDOWNmiss",
"prefix": "skidMISSdown",
"offsets": [163, -40]
"offsets": [163, -56]
},
{
"name": "singUP",
"prefix": "skidUp",
"offsets": [17, 63]
"offsets": [0, 42]
},
{
"name": "singUPmiss",
"prefix": "skidMISSup",
"offsets": [21, 58]
"offsets": [17, 49]
},
{
"name": "singRIGHT",
"prefix": "skidRight",
"offsets": [-66, -18]
"offsets": [-67, -16]
},
{
"name": "singRIGHTmiss",
"prefix": "skidMISSright",
"offsets": [-68, 6]
"offsets": [-67, 4]
},
{
"name": "cheer",
"prefix": "skidCheer",
"offsets": [-55, -18]
"offsets": [-56, -19]
},
{
"name": "firstDeath",
Expand Down
18 changes: 9 additions & 9 deletions assets/preload/data/characters/skid-playable.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,47 +19,47 @@
{
"name": "singLEFT",
"prefix": "skidLeft",
"offsets": [33, -1]
"offsets": [31, 1]
},
{
"name": "singLEFTmiss",
"prefix": "skidMISSleft",
"offsets": [27, 19]
"offsets": [31, 20]
},
{
"name": "singDOWN",
"prefix": "skidDown",
"offsets": [23, -31]
"offsets": [23, -40]
},
{
"name": "singDOWNmiss",
"prefix": "skidMISSdown",
"offsets": [163, -40]
"offsets": [163, -56]
},
{
"name": "singUP",
"prefix": "skidUp",
"offsets": [17, 63]
"offsets": [0, 42]
},
{
"name": "singUPmiss",
"prefix": "skidMISSup",
"offsets": [21, 58]
"offsets": [17, 49]
},
{
"name": "singRIGHT",
"prefix": "skidRight",
"offsets": [-66, -18]
"offsets": [-67, -16]
},
{
"name": "singRIGHTmiss",
"prefix": "skidMISSright",
"offsets": [-68, 6]
"offsets": [-67, 4]
},
{
"name": "cheer",
"prefix": "skidCheer",
"offsets": [-55, -18]
"offsets": [-56, -19]
},
{
"name": "firstDeath",
Expand Down
1 change: 1 addition & 0 deletions assets/preload/data/characters/spooky-nogreen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"name": "singRIGHTmiss-hold",
"prefix": "note sing rightMISS",
"frameIndices": [16, 17, 18, 19, 20, 21],
"looped": true,
"offsets": [-10, -15]
},
{
Expand Down
1 change: 1 addition & 0 deletions assets/preload/data/characters/spooky-playable.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"name": "singRIGHTmiss-hold",
"prefix": "note sing rightMISS",
"frameIndices": [16, 17, 18, 19, 20, 21],
"looped": true,
"offsets": [-10, -15]
},
{
Expand Down
2 changes: 1 addition & 1 deletion assets/preload/data/introText.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ my month?--spooky
dont touch--the child
go fuck--yourself
how--hungry
what do you a hollow weiner--idk i forgot
a hot dog with no insides?--idk i forgot
hey peter--remember the time
family guy--funny moments
sonic.exe...--spooky mix....
Expand Down
9 changes: 8 additions & 1 deletion assets/preload/data/songs/2hot/2hot-chart-spooky.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
"normal": 2.7
},
"events": [
{
"t": 0,
"e": "FocusCamera",
"v": {
"char": 1
}
},
{
"t": 3956.04395604396,
"e": "FocusCamera",
Expand Down Expand Up @@ -19417,4 +19424,4 @@
]
},
"generatedBy": "Friday Night Funkin' - v0.5.2"
}
}
Loading

0 comments on commit 9983a95

Please sign in to comment.