Skip to content

Commit d98a9b9

Browse files
JordanSantiagoYTJordanSantiagoYT
committed
Merge branch 'main' into mobile
2 parents 6065cce + 354d151 commit d98a9b9

File tree

5 files changed

+213
-200
lines changed

5 files changed

+213
-200
lines changed

‎assets/preload/characters/parents-christmas.json‎

Lines changed: 85 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,285 +1,267 @@
11
{
22
"animations": [
33
{
4-
"loop": false,
54
"offsets": [
65
2,
76
0
87
],
9-
"fps": 24,
8+
"loop": false,
109
"anim": "idle",
11-
"indices": [],
12-
"name": "Parent Christmas Idle"
10+
"fps": 24,
11+
"name": "Parent Christmas Idle",
12+
"indices": []
1313
},
1414
{
15-
"loop": false,
1615
"offsets": [
1716
-47,
1817
24
1918
],
20-
"fps": 24,
19+
"loop": false,
2120
"anim": "singUP",
22-
"indices": [],
23-
"name": "Parent Up Note Dad"
21+
"fps": 24,
22+
"name": "Parent Up Note Dad",
23+
"indices": []
2424
},
2525
{
26-
"loop": false,
2726
"offsets": [
2827
-31,
2928
-29
3029
],
31-
"fps": 24,
30+
"loop": false,
3231
"anim": "singDOWN",
33-
"indices": [],
34-
"name": "Parent Down Note Dad"
32+
"fps": 24,
33+
"name": "Parent Down Note Dad",
34+
"indices": []
3535
},
3636
{
37-
"loop": false,
3837
"offsets": [
39-
0,
40-
0
38+
-30,
39+
16
4140
],
42-
"fps": 24,
41+
"loop": false,
4342
"anim": "singLEFT",
44-
"indices": [],
45-
"name": "Parent Left Note Dad"
43+
"fps": 24,
44+
"name": "Parent Left Note Dad",
45+
"indices": []
4646
},
4747
{
48-
"loop": false,
4948
"offsets": [
5049
-1,
5150
-23
5251
],
53-
"fps": 24,
52+
"loop": false,
5453
"anim": "singRIGHT",
55-
"indices": [],
56-
"name": "Parent Right Note Dad"
54+
"fps": 24,
55+
"name": "Parent Right Note Dad",
56+
"indices": []
5757
},
5858
{
59-
"loop": false,
6059
"offsets": [
61-
0,
62-
0
60+
-1,
61+
-24
6362
],
64-
"fps": 24,
63+
"loop": false,
6564
"anim": "singRIGHT-alt",
66-
"indices": [],
67-
"name": "Parent Right Note Mom"
65+
"fps": 24,
66+
"name": "Parent Right Note Mom",
67+
"indices": []
6868
},
6969
{
70-
"loop": false,
7170
"offsets": [
7271
-30,
7372
-27
7473
],
75-
"fps": 24,
74+
"loop": false,
7675
"anim": "singDOWN-alt",
77-
"indices": [],
78-
"name": "Parent Down Note Mom"
76+
"fps": 24,
77+
"name": "Parent Down Note Mom",
78+
"indices": []
7979
},
8080
{
81-
"loop": false,
8281
"offsets": [
8382
-30,
8483
15
8584
],
86-
"fps": 24,
85+
"loop": false,
8786
"anim": "singLEFT-alt",
88-
"indices": [],
89-
"name": "Parent Left Note Mom"
87+
"fps": 24,
88+
"name": "Parent Left Note Mom",
89+
"indices": []
9090
},
9191
{
92-
"loop": false,
9392
"offsets": [
9493
-47,
9594
24
9695
],
97-
"fps": 24,
96+
"loop": false,
9897
"anim": "singUP-alt",
99-
"indices": [],
100-
"name": "Parent Up Note Mom"
98+
"fps": 24,
99+
"name": "Parent Up Note Mom",
100+
"indices": []
101101
},
102102
{
103-
"loop": true,
104103
"offsets": [
105104
2,
106105
0
107106
],
108-
"anim": "idle-loop",
109-
"fps": 24,
110-
"name": "Parent Christmas Idle",
111107
"indices": [
112108
10,
113109
11,
114110
12,
115111
13
116-
]
112+
],
113+
"fps": 24,
114+
"anim": "idle-loop",
115+
"loop": true,
116+
"name": "Parent Christmas Idle"
117117
},
118118
{
119-
"loop": true,
120119
"offsets": [
121120
-47,
122121
24
123122
],
124-
"anim": "singUP-loop",
125-
"fps": 24,
126-
"name": "Parent Up Note Dad",
127123
"indices": [
128124
10,
129125
11,
130126
12,
131127
13
132-
]
128+
],
129+
"fps": 24,
130+
"anim": "singUP-loop",
131+
"loop": true,
132+
"name": "Parent Up Note Dad"
133133
},
134134
{
135-
"loop": true,
136135
"offsets": [
137136
-30,
138137
16
139138
],
140-
"anim": "singLEFT-loop",
141-
"fps": 24,
142-
"name": "Parent Left Note Dad",
143139
"indices": [
144140
12,
145141
13,
146142
14,
147143
15
148-
]
144+
],
145+
"fps": 24,
146+
"anim": "singLEFT-loop",
147+
"loop": true,
148+
"name": "Parent Left Note Dad"
149149
},
150150
{
151-
"loop": true,
152151
"offsets": [
153152
-31,
154153
-29
155154
],
156-
"anim": "singDOWN-loop",
157-
"fps": 24,
158-
"name": "Parent Down Note Dad",
159155
"indices": [
160156
11,
161157
12,
162158
13,
163159
14
164-
]
160+
],
161+
"fps": 24,
162+
"anim": "singDOWN-loop",
163+
"loop": true,
164+
"name": "Parent Down Note Dad"
165165
},
166166
{
167-
"loop": true,
168167
"offsets": [
169168
-1,
170169
-23
171170
],
172-
"anim": "singRIGHT-loop",
173-
"fps": 24,
174-
"name": "Parent Right Note Dad",
175171
"indices": [
176172
12,
177173
13,
178174
14,
179175
15
180-
]
176+
],
177+
"fps": 24,
178+
"anim": "singRIGHT-loop",
179+
"loop": true,
180+
"name": "Parent Right Note Dad"
181181
},
182182
{
183-
"loop": true,
184183
"offsets": [
185184
-1,
186185
-24
187186
],
188-
"anim": "singRIGHT-alt-loop",
189-
"fps": 24,
190-
"name": "Parent Right Note Mom",
191187
"indices": [
192188
11,
193189
12,
194190
13,
195191
14
196-
]
192+
],
193+
"fps": 24,
194+
"anim": "singRIGHT-alt-loop",
195+
"loop": true,
196+
"name": "Parent Right Note Mom"
197197
},
198198
{
199-
"loop": true,
200199
"offsets": [
201200
-47,
202201
24
203202
],
204-
"anim": "singUP-alt-loop",
205-
"fps": 24,
206-
"name": "Parent Up Note Mom",
207203
"indices": [
208204
10,
209205
11,
210206
12,
211207
13
212-
]
208+
],
209+
"fps": 24,
210+
"anim": "singUP-alt-loop",
211+
"loop": true,
212+
"name": "Parent Up Note Mom"
213213
},
214214
{
215-
"loop": true,
216215
"offsets": [
217216
-30,
218217
15
219218
],
220-
"anim": "singLEFT-alt-loop",
221-
"fps": 24,
222-
"name": "Parent Left Note Mom",
223219
"indices": [
224220
11,
225221
12,
226222
13,
227223
14
228-
]
224+
],
225+
"fps": 24,
226+
"anim": "singLEFT-alt-loop",
227+
"loop": true,
228+
"name": "Parent Left Note Mom"
229229
},
230230
{
231-
"loop": true,
232231
"offsets": [
233232
-30,
234233
-27
235234
],
236-
"anim": "singDOWN-alt-loop",
237-
"fps": 24,
238-
"name": "Parent Down Note Mom",
239235
"indices": [
240236
11,
241237
12,
242238
13,
243239
14
244-
]
240+
],
241+
"fps": 24,
242+
"anim": "singDOWN-alt-loop",
243+
"loop": true,
244+
"name": "Parent Down Note Mom"
245245
}
246246
],
247247
"vocals_file": "parents-christmas",
248-
"losing_colors": [
249-
196,
250-
94,
251-
174
252-
],
253-
"isPlayer": false,
254248
"no_antialiasing": false,
255249
"image": "characters/mom_dad_christmas_assets",
256-
"shake_duration": 0,
257250
"position": [
258251
-500,
259252
0
260253
],
261-
"health_drain": false,
262-
"shake_intensity": 0,
263254
"healthicon": "parents",
264-
"shake_screen": false,
265-
"drain_floor": 0,
266255
"flip_x": false,
267256
"healthbar_colors": [
268257
196,
269258
94,
270259
174
271260
],
272-
"drain_amount": 0,
273261
"camera_position": [
274262
0,
275263
0
276264
],
277265
"sing_duration": 4,
278-
"noteskin": null,
279-
"winning_colors": [
280-
196,
281-
94,
282-
174
283-
],
284266
"scale": 1
285267
}

‎source/CreditsState.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class CreditsState extends MusicBeatState
9191
[''],
9292
['Other Special Thanks'],
9393
['Denpa Engine', 'denpeak', 'The crossfade code used for this engine\n(Currently not implemented yet!)', 'https://github.com/UmbratheUmbreon/PublicDenpaEngine', 'FF9300'],
94-
['HRK. EXEX', 'hrk', 'Created the Old Video Rendering Mode for FNF & the Note Skipping idea', 'https://www.youtube.com/@HRK_EXEX/featured', '01F8FF'],
94+
['HRK. EXEX', 'hrk', 'Created the Old Video Rendering Mode for FNF & the Note Skipping idea,\nalong with the Rating Popup recycling idea thing', 'https://www.youtube.com/@HRK_EXEX/featured', '01F8FF'],
9595
['cabfile', 'cabfile', 'Created the new Video Rendering Mode for FNF', 'https://github.com/cabfile', 'DDDDDD'],
9696
['SomeGuyWhoLovesCoding', 'sgwlc', 'Rewrote the chart loading system and ported the new Rendering Mode to source', 'https://www.youtube.com/channel/UCMSusVA3DY-4EtiGP4zKAJA', 'FFBD40'],
9797
['Betopia', 'nothing', 'Freeplay Search bar creator', 'https://www.youtube.com/channel/UCfjyz9xRhZiRbLMteQloVeg', 'FFFFFF'],

‎source/MainMenuState.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ using StringTools;
2323

2424
class MainMenuState extends MusicBeatState
2525
{
26-
public static var psychEngineJSVersion:String = '1.38.0'; //This is also used for Discord RPC
26+
public static var psychEngineJSVersion:String = '1.38.1'; //This is also used for Discord RPC
2727
public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
2828
public static var curSelected:Int = 0;
2929

0 commit comments

Comments
 (0)