File tree
3 files changed
+6
-20
lines changed- source/funkin
- graphics
- play/notes
3 files changed
+6
-20
lines changed- exclude/data/ui/chart-editor/components/menubar.xml+1
- preload/data/characters/dad.json+26-23
- preload/data/characters/darnell-blazin.json+1
- preload/data/characters/gf-car.json+9-3
- preload/data/characters/gf-christmas.json+12-16
- preload/data/characters/mom-car.json+27-15
- preload/data/characters/parents-christmas.json+56-55
- preload/data/characters/pico-blazin.json+8-4
- preload/data/players/bf.json+22-24
- preload/data/players/pico.json+14-14
- preload/images/charSelect/lock/Animation.json+7.5k-35.5k
- preload/images/charSelect/lock/spritemap1.json+280-30
- preload/images/charSelect/lock/spritemap1.png
- preload/images/freeplay/backingCards/pico/pico-confirm/Animation.json+2.2k-8.0k
- preload/images/freeplay/backingCards/pico/pico-confirm/spritemap1.json+49-48
- preload/images/freeplay/backingCards/pico/pico-confirm/spritemap1.png
- preload/images/freeplay/freeplay-boyfriend/Animation.json+23.4k-400.7k
- preload/images/freeplay/freeplay-boyfriend/spritemap1.json+523-278
- preload/images/freeplay/freeplay-boyfriend/spritemap1.png
- preload/images/ui/medal/Animation.json+4.1k-9.9k
- preload/images/ui/medal/spritemap1.json+22-22
- preload/images/ui/medal/spritemap1.png
- preload/scripts/characters/bf-christmas.hxc-1
- preload/scripts/characters/bf-dark.hxc-1
- preload/scripts/characters/bf-holding-gf.hxc-1
- preload/scripts/characters/bf.hxc+9-4
- preload/scripts/characters/gf-dark.hxc-1
- preload/scripts/characters/nene-christmas.hxc+26-42
- preload/scripts/characters/nene-dark.hxc+22-44
- preload/scripts/characters/nene-pixel.hxc+3-6
- preload/scripts/characters/nene-tankmen.hxc+32-30
- preload/scripts/characters/nene.hxc+22-26
- preload/scripts/characters/otis-speaker.hxc+31-65
- preload/scripts/characters/parents-christmas.hxc+2-2
- preload/scripts/characters/pico-blazin.hxc+4-47
- preload/scripts/characters/pico-christmas.hxc-1
- preload/scripts/characters/pico-dark.hxc-1
- preload/scripts/characters/pico-holding-nene.hxc+9-13
- preload/scripts/characters/pico-playable.hxc+7-15
- preload/scripts/characters/spooky-dark.hxc-1
- preload/scripts/players/backcards/backcard-pico.hxc+15-5
- preload/scripts/players/djs/bf.hxc+20-37
- preload/scripts/players/results/bf/BFBedPerfectResults.hxc+6-11
- preload/scripts/players/results/bf/BFShitResults.hxc+6-11
- preload/scripts/players/results/pico/PicoGoodResults.hxc+43-99
- preload/scripts/players/results/pico/PicoGreatResults.hxc+6-11
- preload/scripts/players/results/pico/PicoPerfectResults.hxc+6-11
- preload/scripts/songs/2hot.hxc+21-9
- preload/scripts/songs/darnell.hxc+2-3
- preload/scripts/songs/eggnog-erect.hxc+10-13
- preload/scripts/songs/stress-pico.hxc+7-5
- preload/scripts/stages/mainStageErect.hxc-2
- preload/scripts/stages/mallXmasErect.hxc-2
- preload/scripts/stages/phillyTrainErect.hxc+24-29
- preload/scripts/stages/props/ABotAtlasSprite.hxc+5-11
- preload/scripts/stages/props/DadShootsSprite.hxc+4-20
- preload/scripts/stages/props/PicoBloodPool.hxc+14-44
- preload/scripts/stages/props/PicoDopplegangerSprite.hxc+10-17
- preload/scripts/stages/props/SantaDiesSprite.hxc+4-20
- preload/scripts/stages/props/SpraycanAtlasSprite.hxc+7-15
- preload/scripts/stages/props/TankmanEndingSprite.hxc+5-12
- preload/scripts/stages/tankmanBattlefieldErect.hxc+5-2
- shared/images/characters/dad/Animation.json+1.1k
- shared/images/characters/dad/spritemap1.json+25
- shared/images/characters/dad/spritemap1.png
- shared/images/characters/gf-christmas/Animation.json+1.9k
- shared/images/characters/gf-christmas/spritemap1.json+34
- shared/images/characters/gf-christmas/spritemap1.png
- shared/images/characters/gfCar.png
- shared/images/characters/gfCar.xml-37
- shared/images/characters/gfCar/Animation.json+1.5k
- shared/images/characters/gfCar/spritemap1.json+33
- shared/images/characters/gfCar/spritemap1.png
- shared/images/characters/momCar.png
- shared/images/characters/momCar.xml-67
- shared/images/characters/momCar/Animation.json+2.6k
- shared/images/characters/momCar/spritemap1.json+76
- shared/images/characters/momCar/spritemap1.png
- shared/images/characters/parents-christmas/Animation.json+6.4k
- shared/images/characters/parents-christmas/spritemap1.json+62
- shared/images/characters/parents-christmas/spritemap1.png
- shared/images/characters/picoAndNene-DEAD/Animation.json+11.8k-76.4k
- shared/images/characters/picoAndNene-DEAD/spritemap1.json+134-87
- shared/images/characters/picoAndNene-DEAD/spritemap1.png
- shared/images/resultScreen/results-pico/resultsGOOD/Animation.json+4.1k-1.4k
- shared/images/resultScreen/results-pico/resultsGOOD/spritemap1.json+189-187
- shared/images/resultScreen/results-pico/resultsGOOD/spritemap1.png
- videos/videos/2hotCutscene.mp4
- week7/images/erect/masks/neneTankmen_mask.png
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
420 | 420 | | |
421 | 421 | | |
422 | 422 | | |
423 | | - | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
424 | 426 | | |
425 | 427 | | |
426 | 428 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
| 46 | + | |
45 | 47 | | |
46 | 48 | | |
47 | 49 | | |
| |||
183 | 185 | | |
184 | 186 | | |
185 | 187 | | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | 188 | | |
205 | 189 | | |
206 | 190 | | |
| |||
0 commit comments