Cameron Taylor
678dbc0ab7
Merge branch 'rewrite/master' into a-bot-bars
2024-04-19 15:11:28 -04:00
FabsTheFabs
351cb8cbaa
popupstuff changes + make combopopup able to be edited outside of playstate
2024-04-19 14:14:33 -04:00
Cameron Taylor
035db7f00a
Merge branch 'rewrite/master' into bugfix/draw-crash
2024-04-19 14:03:58 -04:00
Cameron Taylor
93ae7692c8
Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes
2024-04-19 13:55:01 -04:00
Cameron Taylor
1405e21e3d
Merge branch 'rewrite/master' into a-bot-bars
2024-04-16 20:02:08 -04:00
EliteMasterEric
d346c9387c
Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA
2024-04-16 19:42:52 -04:00
EliteMasterEric
43ec72fb9d
Ensure playNoteHoldCover doesn't call if note is judged as 'miss'
2024-04-15 20:36:38 -04:00
Cameron Taylor
658fd392fa
Merge branch 'rewrite/master' into a-bot-bars
2024-04-14 02:57:05 -04:00
EliteMasterEric
6f5c3a043f
Fix crash caused when game tries to render disposed sprites during a Sticker transition.
2024-04-10 14:45:07 -04:00
Cameron Taylor
5f48ca82bd
Merge branch 'rewrite/master' into bugfix/additional-fixins
2024-04-09 23:50:05 -04:00
EliteMasterEric
b464f51ba2
Fix an issue where a missing stage would cause a crash (rather than an error popup)
2024-04-06 22:38:32 -04:00
EliteMasterEric
ea1d123c49
Fixes to Pico Blazin' animations.
2024-04-06 21:42:31 -04:00
EliteMasterEric
5beb20ec7c
Fix bug where restarting the song would sometimes crash.
2024-04-06 21:42:18 -04:00
EliteMasterEric
14869b9373
Also disable highscores in botplay
2024-04-06 02:08:10 -04:00
EliteMasterEric
99ee2b07ca
Make results screen use full campaign score in Story Mode
2024-04-06 02:06:06 -04:00
EliteMasterEric
29f105a44d
Practice mode = no highscore!
2024-04-06 01:59:46 -04:00
EliteMasterEric
a6d44b1f15
Removed many unused assets to optimize bandwidth usage.
2024-04-05 19:43:52 -04:00
EliteMasterEric
95434018f7
Readd GF camera zoom into results state.
2024-04-05 02:56:47 -04:00
Eric
fd88ebef63
Merge pull request #467 from FunkinCrew/retro-fade
...
small fade polish for week 8 convos
2024-04-05 02:47:10 -04:00
EliteMasterEric
9c8ab72494
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes
2024-04-05 02:45:23 -04:00
EliteMasterEric
08e8530ad4
Fix SetCameraBopSongEvent to be additive
2024-04-05 02:44:44 -04:00
EliteMasterEric
07092269b8
Merge branch 'rewrite/master' into input-offsets
2024-04-04 18:45:16 -04:00
Cameron Taylor
8f3406cb0e
Merge branch 'rewrite/master' into feature/results-screen-score
2024-04-04 05:34:29 -04:00
Cameron Taylor
544dcdf809
Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1
2024-04-04 05:32:26 -04:00
Cameron Taylor
57a5973c2c
small fade polish for week 8 convos
2024-04-04 05:22:44 -04:00
EliteMasterEric
33685b2bcd
Fix an issue where player could not switch difficulties from Pause menu until they beat Weekend 1.
2024-04-04 04:08:07 -04:00
EliteMasterEric
8826d0741b
Hide miss popups when hitting ~160ms
2024-04-04 03:31:44 -04:00
EliteMasterEric
f129cb7997
Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs
2024-04-03 21:57:29 -04:00
EliteMasterEric
d911c46d2f
Better scoring numbers and improved anims.
2024-04-03 06:24:20 -04:00
EliteMasterEric
1759f5c388
Note cover now only plays splash on player
2024-04-03 04:52:28 -04:00
EliteMasterEric
e9d8546737
More results screen changes
2024-04-03 04:52:12 -04:00
Cameron Taylor
dcffe0537f
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
2024-04-01 22:40:10 -04:00
Cameron Taylor
d6723a8212
Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition
2024-04-01 22:14:29 -04:00
Cameron Taylor
165e20c318
Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes
...
Bugfix/judgements below notes
2024-04-01 22:08:00 -04:00
Cameron Taylor
db89e199c4
Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
...
Bunch of results screen fixes
2024-04-01 22:07:43 -04:00
EliteMasterEric
67e096e443
Bunch of results screen fixes
2024-04-01 21:59:53 -04:00
Cameron Taylor
bf9f87e9e7
Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note
...
Bugfix/spookeez hold note
2024-04-01 21:00:14 -04:00
EliteMasterEric
927b2a7cfc
Put judgements below the notes, and remove COMBO word.
2024-04-01 20:21:27 -04:00
Cameron Taylor
ac5ca3991e
Merge branch 'rewrite/master' into feature/new-audio
2024-03-30 03:32:30 -04:00
EliteMasterEric
28462681b2
Fix bug where 100ms sustains wouldn't update their rendering.
2024-03-29 00:52:20 -04:00
EliteMasterEric
7c04630bb7
Fix a bug where duplicate notes would get placed at the beginning
2024-03-29 00:49:02 -04:00
EliteMasterEric
342782c3d3
Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu
2024-03-28 22:33:50 -04:00
Jenny Crowe
e2851818b3
Zoom Camera: Property tweaks
2024-03-28 17:47:38 -07:00
Eric
0eddea9bf8
Merge branch 'rewrite/master' into bugfix/combo-fixes
2024-03-28 20:32:34 -04:00
EliteMasterEric
e5a10c6a25
Merge branch 'rewrite/master' into a-bot-bars
2024-03-28 20:26:13 -04:00
EliteMasterEric
35f99b49a4
Merge branch 'rewrite/master' into input-offsets
2024-03-28 20:23:31 -04:00
Jenny Crowe
76885c421d
Cleanup + Focus Camera: Use Tween toggle converted to "Classic" ease type.
2024-03-28 12:34:13 -07:00
Jenny Crowe
d4c9fffe48
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into bugfix/quick-camera-fixes
2024-03-28 11:05:51 -07:00
Jenny Crowe
ef2cb4d9fc
Convert zoom modifiers from additive to multiplicative
2024-03-28 11:05:38 -07:00
EliteMasterEric
837fcee983
Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit)
2024-03-28 00:19:57 -04:00
EliteMasterEric
c1c2621e1d
Fix bug where Bad and Shit didn't count at Notes Hit in the results screen.
2024-03-28 00:18:39 -04:00
EliteMasterEric
201e018f25
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes
2024-03-28 00:03:09 -04:00
EliteMasterEric
f267a72783
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-audio
2024-03-27 23:00:34 -04:00
Cameron Taylor
53d62c3c12
Merge branch 'rewrite/master' into bugfix/pico-fixes
2024-03-27 22:14:44 -04:00
EliteMasterEric
f1811a8594
Implement Pico pause music
2024-03-27 17:42:29 -04:00
EliteMasterEric
463e946b17
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes
2024-03-27 01:40:22 -04:00
EliteMasterEric
843095e3de
Add debug logging to Flixel debugger for miss judgements
2024-03-27 01:25:38 -04:00
EliteMasterEric
6b35898ed9
Fix some issues with Weekend 1.
2024-03-26 23:24:59 -04:00
EliteMasterEric
e84fdf9fac
Resolve FlxG.sound.music crash
2024-03-26 19:38:42 -04:00
Cameron Taylor
524ae119fa
Merge branch 'rewrite/master' into bugfix/blazin-crashes
2024-03-26 01:30:59 -04:00
EliteMasterEric
8943cd117e
Make the error message a bit better if an Animate atlas fails to parse.
2024-03-26 01:12:46 -04:00
EliteMasterEric
5ae075e947
Fix a couple Flixel warnings on the results screen.
2024-03-25 21:09:14 -04:00
EliteMasterEric
07ad250060
Fix an audio crash when exiting a cutscene
2024-03-25 21:08:39 -04:00
Cameron Taylor
ccfb9ca65b
Merge branch 'rewrite/master' into feature/high-erect
2024-03-25 16:02:09 -04:00
Cameron Taylor
fe6cb8c5a9
Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul
...
Funkin Sound overhaul
2024-03-25 15:59:02 -04:00
Cameron Taylor
6a0672684c
Merge pull request #416 from FunkinCrew/bugfix/camera-zoom-option
...
Fix a bug where the Camera Zoom toggle didn't work.
2024-03-25 14:52:24 -04:00
Cameron Taylor
9fd780e00c
Merge branch 'rewrite/master' into bugfix/cut-pico-dadbattle
2024-03-25 13:42:50 -04:00
Cameron Taylor
c456430910
Merge pull request #414 from FunkinCrew/bugfix/opponent-mute-on-miss
...
Fix a bug where lag could cause the opponent to miss which would mute the vocals.
2024-03-25 13:37:12 -04:00
Cameron Taylor
3c9f63892b
Merge pull request #411 from FunkinCrew/feature/video-cutscene-hide
...
Hide a video cutscene after playing it
2024-03-25 13:37:00 -04:00
EliteMasterEric
138dfd61e8
Fix a bug where the Camera Zoom toggle didn't work.
2024-03-23 23:52:08 -04:00
EliteMasterEric
24b03e4f6b
Replace calls to FlxG.sound.playMusic with ones that set the BPM.
2024-03-23 23:38:07 -04:00
EliteMasterEric
709fbc8594
Fix a bug where lag could cause the opponent to miss.
2024-03-23 18:11:06 -04:00
EliteMasterEric
6407770ed6
Rework every class to use FunkinSound.
2024-03-23 17:50:48 -04:00
EliteMasterEric
dc638a1303
Fix a bunch of merge bugs.
2024-03-23 15:34:37 -04:00
EliteMasterEric
831d6aae71
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
2024-03-23 14:38:50 -04:00
EliteMasterEric
e4a9d25ac0
Syntax fix
2024-03-22 23:53:29 -04:00
EliteMasterEric
471b015d1a
Add some FlxSignals and showVideo/hideVideo
2024-03-22 23:46:03 -04:00
Cameron Taylor
932f7bce41
Merge pull request #408 from FunkinCrew/bugfix/camera-behavior-fixes
...
Make the ZoomCamera events use sensible defaults.
2024-03-22 23:38:26 -04:00
EliteMasterEric
28088146eb
Fix bug where Pico dadbattle was playing over normal dadbattle
2024-03-22 22:17:34 -04:00
Cameron Taylor
a695fb2b39
Merge branch 'rewrite/master' into formatting-fixes
2024-03-22 19:00:29 -07:00
EliteMasterEric
83e8865a24
Make the ZoomCamera events use sensible defaults.
2024-03-22 20:29:35 -04:00
Cameron Taylor
7d008e7247
playstate camera fixie
2024-03-22 15:03:17 -07:00
Cameron Taylor
9d7831d40b
Merge branch 'rewrite/master' into bugfix/minimal-mode-gameover
2024-03-22 14:56:41 -07:00
EliteMasterEric
c765249030
Complain if the main metadata file specifies a variation (like erect) but the game can't find it.
2024-03-22 03:04:52 -04:00
Cameron Taylor
f7acee94cd
Merge branch 'rewrite/master' into feature/freeplay-album-art
2024-03-21 23:37:20 -07:00
EliteMasterEric
2b91c0f926
Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening
2024-03-22 00:06:55 -04:00
EliteMasterEric
efa0e103b0
Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars
2024-03-21 21:54:22 -04:00
EliteMasterEric
105aca4707
Fix an issue where hidden difficulties could end up in the difficulty list.
2024-03-21 19:44:02 -04:00
EliteMasterEric
36a9c29720
Work in progress on custom album art for freeplay
2024-03-20 14:37:24 -04:00
EliteMasterEric
566a271a63
Fix several crashes when reaching a game over in minimal mode
2024-03-19 23:25:56 -04:00
Eric
41b9ba9bce
Merge branch 'rewrite/master' into a-bot-bars
2024-03-19 22:33:02 -04:00
EliteMasterEric
9eda84019d
Merge branch 'rewrite/master' into a-bot-bars
2024-03-19 13:34:06 -04:00
EliteMasterEric
3a35be916b
A bunch of checkstyle fixes
2024-03-16 22:20:22 -04:00
Jenny Crowe
494a3c9e86
Bugfixes. New additive zoom mode for camera tweening.
2024-03-16 08:38:10 -07:00
EliteMasterEric
d56c33cd17
Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!).
2024-03-16 00:55:57 -04:00
EliteMasterEric
ea491e57a0
Switch "Skip Cutscene" and "Restart Cutscene" (Dave's request)
2024-03-15 17:16:44 -04:00
EliteMasterEric
f31634351b
Fix an issue where stage character scale was overriding base character scale.
2024-03-15 16:45:18 -04:00
Jenny Crowe
1541f0aa68
Camera tween pausing/unpausing additions
2024-03-15 01:52:22 -07:00
Jenny Crowe
42506909f7
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-14 15:24:51 -07:00
Cameron Taylor
b5bc63feca
use isMinimalMode
2024-03-13 21:27:09 -07:00
Cameron Taylor
1211dbb6e8
Merge branch 'rewrite/master' into feature/chart-editor-song-scripts
2024-03-13 21:26:50 -07:00
Cameron Taylor
b9ab38e0b9
timertools -> timerutil fix
2024-03-13 18:47:15 -07:00
Cameron Taylor
1a224423f9
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into bugfix/precache-library-assets
2024-03-13 18:41:45 -07:00
EliteMasterEric
43cf1e71e2
Disable camera events in the minimal playtest.
2024-03-12 21:35:55 -04:00
EliteMasterEric
66085ff867
Song scripts can now be (optionally) enabled in the Chart Editor playtest
2024-03-12 21:34:50 -04:00
EliteMasterEric
be8f5699b5
2hot stutter actually fixed!
2024-03-11 23:42:32 -04:00
Jenny Crowe
6b8fb7dc77
Standardized camera zoom tweening to match camera follow tweening. Implemented methods to cancel tweens in necessary places. Start of pausing tweens when pausing the game (WIP). (CHANGES NOT TESTED EXPECT SOMETHING TO BREAK)
2024-03-10 16:35:41 -07:00
Jenny Crowe
f9291d6458
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-10 14:51:24 -07:00
Cameron Taylor
fbc5d9955d
Merge pull request #380 from FunkinCrew/bugfix/weekend-1-sing-time
...
Weekend 1: Fix default value for singTime to use correct unit.
2024-03-10 13:28:34 -04:00
EliteMasterEric
09029718aa
Fix an issue where story menu characters bop too fast
2024-03-08 21:33:06 -05:00
EliteMasterEric
9284f1495b
Fix default value for singTime to use correct unit.
2024-03-08 20:56:34 -05:00
EliteMasterEric
6edc274748
Merge branch 'rewrite/master' into a-bot-bars
2024-03-08 20:54:11 -05:00
EliteMasterEric
7d0d839cfb
Merge branch 'rewrite/master' into a-bot-bars
2024-03-08 20:03:15 -05:00
Cameron Taylor
7a5d48b290
Merge branch 'rewrite/master' into feature/blazin-touchups
2024-03-08 16:43:56 -05:00
Eric
c40919f53f
Merge pull request #375 from FunkinCrew/bugfix/html5-video
...
Use correct resource URL when loading videos
2024-03-08 00:31:10 -05:00
EliteMasterEric
1808f08554
Merge branch 'rewrite/master' into a-bot-bars
2024-03-08 00:21:51 -05:00
Cameron Taylor
d6608fe435
a-bot in progress
2024-03-07 14:19:26 -05:00
Mike Welsh
b0abef0d52
Use correct resource URL when loading videos
...
On HTML5, `VideoCutscene` was not stripping the library prefix
from the video file path, causing the video to fail to load.
Fixes FPIQ-281.
2024-03-06 23:37:50 -08:00
EliteMasterEric
332a81ec72
No longer miss notes during ending cutscene
2024-03-06 17:22:11 -05:00
Cameron Taylor
b2d3fe17d7
fun lil pitch effect on result scren
2024-03-06 02:56:10 -05:00
Cameron Taylor
1ebfeb3a89
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/script-event-note-incoming
2024-03-05 23:57:53 -05:00
EliteMasterEric
1b1834e98b
Implement a botplay checkbox in the chart editor
2024-03-05 22:27:07 -05:00
EliteMasterEric
059e1c0e13
Implement onNoteIncoming script event.
2024-03-05 21:48:04 -05:00
Eric
3aa4c23340
Merge branch 'rewrite/master' into bugfix/chart-editor-vocal-crash
2024-03-04 23:00:38 -05:00
Jenny Crowe
132eda6715
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-04 20:57:54 -07:00
Jenny Crowe
d9cf097e46
Fixed bools and associated checkboxes not updating properly.
2024-03-04 20:57:21 -07:00
Cameron Taylor
acc75c5c5c
use totalNotes instead of currentChart.notes.length
2024-03-04 21:25:56 -05:00
EliteMasterEric
d0f81add95
Fix a bug where Chart Editor Playtest destroys the vocals and crashes
2024-03-04 21:19:24 -05:00
Cameron Taylor
fa72fa44b1
tallies for story mode
2024-03-04 21:18:40 -05:00
Cameron Taylor
d2b124efca
some highscore tallies debugging stuf in progress
2024-03-04 20:47:23 -05:00
Jenny Crowe
d9a69dac10
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-04 18:20:00 -07:00
Cameron Taylor
7f4c36c8f4
some checkstyle stuff
2024-03-04 19:03:43 -05:00
Cameron Taylor
ae7d8b9046
Merge branch 'rewrite/master' into feature/blazin-animation-work
2024-03-04 18:11:11 -05:00
EliteMasterEric
73cf6b9fd2
Rewrite save data to fix scripted story levels. Add a "pre-transition death delay"
2024-03-04 16:37:42 -05:00
Mike Welsh
fcce345454
Avoid null reference error with music
2024-03-04 02:26:54 -08:00
Jenny Crowe
abb4400e41
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-03 02:51:01 -07:00
Hazel
0a19c7a8cb
fix(ci), feat(ci), refactor: i don't need sleep, i need answers ( #357 )
...
* hx the codec
* fix(ci,html5): use haxe.Timer instead of Sys.time
* refactor(compat): use haxe.Timer instead of Sys.time(), introduce TimerUtil to reduce code dupe
* fix: redundant types
* refactor(style): use TimerTools in place of haxe.Timer
* refactor: consistent timer code
* feat: build timings
* refactor(ci): cleanup ci configs
* sigh
* sigh, 2
* fix: haxelib deleterepo does not silently fail
* retrigger ci
* verbose output
* debug info after haxelib gti
* force haxelib git override
* more debug info
* force bash
* at least haxelib is consistent now
* fix the runners first, then do that
* update ci-haxe
* it is time?
* deleterepo may fail
* finishing touches
2024-03-02 23:49:27 -05:00
EliteMasterEric
f7a3d43e54
Fixes to animation looping and holds
2024-03-02 22:46:13 -05:00
fabs
f8481a0efe
fixed pico game over loop from playing a duplicate track ( #356 )
...
* fixed pico game over loop from playing a duplicate track that persists in menus
* assets submod
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2024-03-02 13:56:44 -05:00
EliteMasterEric
0294ea0b79
Implemented FlxAnimate characters into Blazin'.
2024-03-01 08:13:06 -05:00
Cameron Taylor
35d0feceb8
assets submod
2024-03-01 00:15:30 -05:00
EliteMasterEric
684eb919b5
Make the playback rate option explicit so it doesn't break in the future.
2024-02-29 18:49:20 -05:00
Jenny Crowe
db80bba100
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-02-29 15:11:20 -07:00
Cameron Taylor
e36629a41f
Merge branch 'rewrite/master' into feature/new-pause-menu
2024-02-29 13:53:55 -05:00
Cameron Taylor
88f57cf520
pause menu tween polish
2024-02-29 13:53:09 -05:00
EliteMasterEric
0139d5c4f6
Fix a crash on atlas characters.
2024-02-29 01:19:32 -05:00
EliteMasterEric
1d70ff95f9
Several chart editor fixes (more precise playback speed, live input mode loads properly from save)
2024-02-28 21:19:21 -05:00
EliteMasterEric
2252040241
Fix custom pause music in Week 6, improve documentation
2024-02-28 14:51:39 -05:00
EliteMasterEric
8683900922
Fixes to cutscene pausing.
2024-02-28 03:53:36 -05:00
EliteMasterEric
5d030b8a31
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu
2024-02-28 03:04:56 -05:00
EliteMasterEric
cecddbc2ee
Fixed issues with audio in Week 6 after skipping the cutscene.
2024-02-28 03:01:20 -05:00
Jenny Crowe
858d8edf7a
Cam tweening working! UI buggy af. To fix.
2024-02-27 23:29:40 -07:00
EliteMasterEric
13d6ba378e
Work in progress on fixing Week 6
2024-02-28 00:19:08 -05:00
Cameron Taylor
3764a5db3f
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into a-bot-bars
2024-02-27 22:41:08 -05:00
EliteMasterEric
12a48b9b86
Work in progress on revamped, more extensible pause menu.
2024-02-26 23:18:56 -05:00
EliteMasterEric
90360de0d0
Working Blazin cutscene and fixed time travel
2024-02-26 19:03:04 -05:00
Cameron Taylor
6f88865e0b
viz in progress
2024-02-23 04:00:31 -05:00
EliteMasterEric
e349b0bb49
New pre-caching techniques should reduce stuttering on Weekend 1.
2024-02-23 00:16:11 -05:00
EliteMasterEric
ddfb0c6a61
Working on more asset caching improvements.
2024-02-22 23:37:52 -05:00
EliteMasterEric
01ed1730f4
Fix some issues with cutscenes.
2024-02-22 20:56:41 -05:00
EliteMasterEric
539b688055
Exploration in expanding FunkinSprite for optimization
2024-02-22 18:55:24 -05:00
Cameron Taylor
6e691c66c3
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into input-offsets
2024-02-19 20:33:36 -05:00
EliteMasterEric
44623071cd
Redo event stuff for abot and game over audio logic
2024-02-18 03:02:36 -05:00
EliteMasterEric
12335fef9d
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-17 15:18:23 -05:00
Cameron Taylor
0a83f2f1e8
Merge branch 'rewrite/master' into feature/chart-editor-note-kind
2024-02-17 05:26:58 -05:00
Mike Welsh
a523b82439
Fix songs failing to load on HTML5 target
...
Do a small refactor of `LoadingState` to fix loading songs on the
when `NO_PRELOAD_ALL` is defined.
This allows the HTML5 target to progress into song gameplay again.
2024-02-16 21:00:44 -08:00
EliteMasterEric
de8fe2e271
Merge branch 'feature/chart-editor-note-kind' into feature/2hot-death-animation
2024-02-16 22:46:06 -05:00
EliteMasterEric
98e6d4091e
Revamp note kind handling in the chart editor.
2024-02-16 22:01:47 -05:00
Mike Welsh
e90c37ad75
Fix issue with incorrect music after pausing during countdown
...
Whenever you pause gameplay, the `PlayState` pauses the music.
But if you start a song from the main menu, pause during the 3,2,1
countdown, and then unpause, the main menu music will incorrectly
start playing again due to `FlxG.sound.music` still referencing it
before the gameplay song starts playing.
Only restart the music if it was actually playing to begin with by
storing the play state in `PlayState.openSubState` when we pause.
This hopefully avoids any other cases where the pause state gets
pushed while the music is stopped.
2024-02-16 04:54:27 -08:00
EliteMasterEric
5ec0939263
Bunch of changes to NoteScriptEvent and death logic
2024-02-15 17:25:28 -05:00
Cameron Taylor
c3d03011cc
Merge branch 'rewrite/master' into input-offsets
2024-02-13 03:34:41 -05:00
EliteMasterEric
bd4103fd11
Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload
2024-02-13 03:06:20 -05:00
Cameron Taylor
6b80e292e5
Merge branch 'rewrite/master' into input-offsets
2024-02-13 03:02:33 -05:00
EliteMasterEric
fa4b896d9a
Merge branch 'rewrite/master' into feature/hashlink-hot-reload
2024-02-13 02:23:14 -05:00
EliteMasterEric
c4522fe177
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
2024-02-13 02:17:06 -05:00
EliteMasterEric
f7da12acbc
Apparently the transition bug was TransitionableSubState's fault so kill it with fire.
2024-02-13 02:09:25 -05:00
EliteMasterEric
f0b5ef4491
Rest in peace, SwagCamera.
2024-02-13 01:38:11 -05:00
Cameron Taylor
41e94f951e
Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character
2024-02-13 00:48:26 -05:00
Cameron Taylor
8c54a62ed6
Merge branch 'rewrite/master' into feature/freeplay-pico-character
2024-02-13 00:41:03 -05:00
Cameron Taylor
6e0f577d54
debugger fixes
2024-02-13 00:29:46 -05:00
EliteMasterEric
0ff258ce75
Use stickers to transition from the Results state
2024-02-12 23:34:51 -05:00
EliteMasterEric
1b5b7f0ae2
Fix a bug where stickers were broken on story mode
2024-02-12 23:34:40 -05:00
EliteMasterEric
0494ddb506
Fix crash in chart editor minimal Playtest
2024-02-12 23:19:25 -05:00
Cameron Taylor
25766dbde9
decoupling some stuff from Conductor.instance
2024-02-12 21:41:16 -05:00
Cameron Taylor
0145d7ed2d
input offset edits in progress
2024-02-12 20:06:43 -05:00
EliteMasterEric
ef28d34520
Sort PlayState imports
2024-02-12 16:50:29 -05:00
Cameron Taylor
d903edcb59
Merge branch 'rewrite/master' into input-offsets
2024-02-10 15:43:27 -05:00
EliteMasterEric
d0b3842d44
Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev
2024-02-10 02:38:23 -05:00
EliteMasterEric
eea8dde455
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
2024-02-10 02:30:50 -05:00
EliteMasterEric
091f8eb724
Merge branch 'rewrite/master' into feature/freeplay-pico-character
2024-02-09 23:13:40 -05:00
EliteMasterEric
2dd5f476b5
Fix a bug where alt instrumentals will load but not cache.
2024-02-08 02:21:12 -05:00
EliteMasterEric
31cd5b3414
Rework Conversation data parsing
2024-02-07 18:45:13 -05:00
EliteMasterEric
fa556dc1f2
Rewrite conversation JSON parsing code.
2024-02-07 09:21:44 -05:00
EliteMasterEric
82b63c02e1
Reworks to make Pico mode actually work.
2024-02-05 21:35:58 -05:00
EliteMasterEric
e5fb1de4ba
Fix a boatload of deprecation warnings and upgrade a few libraries.
2024-02-05 19:46:11 -05:00
EliteMasterEric
167976c8ba
Work in progress
2024-02-05 13:35:30 -05:00
Cameron Taylor
0f29f2f7a6
Merge branch 'rewrite/master' into input-offsets
2024-01-31 00:39:35 -05:00
Jenny Crowe
bfb032dc7f
Added units to other song events.
2024-01-26 18:51:36 -07:00
Jenny Crowe
8b19a7511c
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units
2024-01-26 18:20:04 -07:00
Jenny Crowe
e111e91a9c
Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly.
2024-01-24 20:31:25 -07:00
