Commit graph

1393 commits

Author SHA1 Message Date
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
Cameron Taylor
c23f97917c Merge branch 'rewrite/master' into preloader-polish 2024-04-04 03:43:23 -04:00
EliteMasterEric
3ac466aa5e Add missing MapTools function from #459 2024-04-04 03:35:36 -04:00
EliteMasterEric
8826d0741b Hide miss popups when hitting ~160ms 2024-04-04 03:31:44 -04:00
EliteMasterEric
57d6ed118d Hide Rating on the right side of the items in Freeplay 2024-04-04 03:31:03 -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
d8903f138f Additional save fix 2024-04-03 20:50:51 -04:00
EliteMasterEric
58427363d1 Prevent a crash trying to open a non-existant debugger checkbox. 2024-04-03 20:33:51 -04:00
EliteMasterEric
b39712d33f Prevent crashes when the game attempts to load bad save data. 2024-04-03 20:31:34 -04:00
EliteMasterEric
4f2f28cb31 Fix issue with deepMerge() caused by handling maps incorrectly, causing an unhandleable crash. 2024-04-03 15:05:54 -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
ad39ce3c21 local conductor got removed somewhere? 2024-04-03 04:43:12 -04:00
Cameron Taylor
99e19f8460 Merge branch 'rewrite/master' into hl-compiles 2024-04-03 03:40:22 -04:00
Cameron Taylor
b7c6b1aaf6 Merge pull request #458 from FunkinCrew/bugfix/a-couple-more-fixes
Bugfix/a couple more fixes
2024-04-03 03:38:37 -04:00
Cameron Taylor
668f47f761 Merge pull request #457 from FunkinCrew/html5/touch-to-start
Fix some build issues with HTML5.
2024-04-03 03:37:41 -04:00
EliteMasterEric
f7141e7096 Fixed an issue with save data not loading defaults properly. 2024-04-03 01:41:52 -04:00
EliteMasterEric
2b4bf42ac4 Fix multiple music, and crashes in freeplay 2024-04-03 01:41:47 -04:00
EliteMasterEric
f7ff381bc7 Fix some build issues with HTML5. 2024-04-02 23:33:10 -04:00
EliteMasterEric
90cf53b959 Someone forgot to merge assets from the credits branch. 2024-04-02 17:27:29 -04:00
Cameron Taylor
dcffe0537f Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-04-01 22:40:10 -04:00
Cameron Taylor
03cbba4a4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-04-01 22:21:29 -04:00
Cameron Taylor
d6723a8212 Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition 2024-04-01 22:14:29 -04:00
Cameron Taylor
8a60115df6 Merge pull request #454 from FunkinCrew/feature/erect-filter-freeplay
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 22:08:25 -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
Cameron Taylor
7fb4b47e2a Merge branch 'rewrite/master' into feature/credits 2024-04-01 22:06:58 -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
EliteMasterEric
1df4a354cb Freeplay menu now filters to supported songs when you change difficulty 2024-04-01 18:34:26 -04:00
Cameron Taylor
ac5ca3991e Merge branch 'rewrite/master' into feature/new-audio 2024-03-30 03:32:30 -04:00
Cameron Taylor
52c5f81e26 Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera 2024-03-30 03:24:46 -04:00
Cameron Taylor
32ed26ffa6 stereo preloader in progress 2024-03-29 17:54:20 -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
ddb41c9ef7 Increase AFK timer, and add SFX over it 2024-03-28 23:13:47 -04:00
Cameron Taylor
b75c7c2361 funkVis html5 2024-03-28 23:08:50 -04:00
EliteMasterEric
342782c3d3 Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu 2024-03-28 22:33:50 -04:00
EliteMasterEric
8020624366 Fix a crash I found. 2024-03-28 21:40:16 -04:00
Jenny Crowe
e2851818b3 Zoom Camera: Property tweaks 2024-03-28 17:47:38 -07:00
EliteMasterEric
443a501e4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-03-28 20:33:17 -04:00
Eric
0eddea9bf8 Merge branch 'rewrite/master' into bugfix/combo-fixes 2024-03-28 20:32:34 -04:00
EliteMasterEric
22f8d39ef1 Merge branch 'rewrite/master' into hl-compiles 2024-03-28 20:32:11 -04:00
Eric
7e96b02248 Merge branch 'rewrite/master' into feature/new-audio 2024-03-28 20:31:10 -04:00
EliteMasterEric
571c6d5960 Merge branch 'rewrite/master' into feature/credits 2024-03-28 20:29:15 -04:00
EliteMasterEric
9990cbbd27 Merge branch 'rewrite/master' into feature/conductor-signal-rework 2024-03-28 20:27:54 -04:00
Eric
5fa559dfb1 Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 20:26:45 -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
EliteMasterEric
6a131555f8 Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-03-28 20:15:32 -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
Cameron Taylor
86c91d1e82 Merge pull request #436 from FunkinCrew/feature/touch-here-to-play
New Funkin' Preloader, and Touch Here To Play
2024-03-28 07:15:53 -04:00
EliteMasterEric
8a9eee3aa3 Rework Funkin Preloader and added "Touch to Play" graphic 2024-03-28 04:34:43 -04:00
EliteMasterEric
6ab6458e2a Merge remote-tracking branch 'origin/rewrite/master' into feature/credits 2024-03-28 03:00:45 -04:00
EliteMasterEric
3d14024fd8 Implement merch link. 2024-03-28 02:58:08 -04:00
EliteMasterEric
3a86b47292 Fix issue where main menu music wouldn't play after credits. 2024-03-28 02:57:51 -04:00
EliteMasterEric
5311b043ac Rework credits data structure. 2024-03-28 02:57:22 -04:00
EliteMasterEric
b13c6563df Fix issues with Freeplay OST text and add animations. 2024-03-28 01:46:50 -04: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
893822532e Fix an issue causing the Kickstarter video to not play 2024-03-28 00:01:42 -04:00
EliteMasterEric
b771b46f1c Fix a build issue. 2024-03-28 00:01:18 -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
Cameron Taylor
96fe131544 Merge pull request #430 from FunkinCrew/feature/miss-judgement-debug
Add debug logging to Flixel debugger for miss judgements
2024-03-27 21:56:18 -04:00
Cameron Taylor
77b65ba68c shader var renames for hashlink 2024-03-27 21:32:13 -04:00
Cameron Taylor
0f80f1c8a6 Merge pull request #417 from FunkinCrew/bugfix/freeplay-afk-fixes
Bugfix/freeplay afk fixes
2024-03-27 21:08:08 -04:00
Cameron Taylor
3181795985 remove trace() calls from ages ago while im here 2024-03-27 20:58:58 -04:00
EliteMasterEric
195f366b65 Fix an issue where the Random button would crash Freeplay. 2024-03-27 17:43:15 -04:00
EliteMasterEric
f1811a8594 Implement Pico pause music 2024-03-27 17:42:29 -04:00
EliteMasterEric
77cf96716e Work in progress on Conductor signal rework 2024-03-27 02:55:53 -04:00
EliteMasterEric
bb98c710a3 Merge remote-tracking branch 'origin/rewrite/master' into feature/conductor-signal-rework 2024-03-27 01:52:58 -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
Cameron Taylor
cccfdd0638 Merge branch 'rewrite/master' into feature/more-new-charts 2024-03-27 01:09:45 -04:00
EliteMasterEric
4209c5156e Readd a missing sound in the story menu 2024-03-27 01:02:11 -04:00
EliteMasterEric
6b35898ed9 Fix some issues with Weekend 1. 2024-03-26 23:24:59 -04:00
EliteMasterEric
0e93f2ab27 Improve error logging when the game can't find a chart file. 2024-03-26 21:30:08 -04:00
EliteMasterEric
9ebb253b53 Fix music updating issue. 2024-03-26 19:38:56 -04:00
EliteMasterEric
e84fdf9fac Resolve FlxG.sound.music crash 2024-03-26 19:38:42 -04:00
Eric
88c973f1ae Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes 2024-03-26 19:35:10 -04:00
EliteMasterEric
1e888658f7 First implementation of credits state. 2024-03-26 12:33:54 -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
90f861628d Fix an HTML5 build issue. 2024-03-25 21:09:02 -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
51d36ea25e Work in progress on fixing Boyfriend's spook/tv animations 2024-03-24 04:53:05 -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
a8486a47df Fix a bug where the album disappears never to return 2024-03-23 18:22:15 -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
Eric
8e8ec2c5aa Merge branch 'rewrite/master' into funkin-crew-presents 2024-03-22 23:55:05 -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
Cameron Taylor
01e83d4713 the funkin crew presents 2024-03-22 20:21:09 -07: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
EliteMasterEric
e64637ffdf Rework Conductor to use instanced signals 2024-03-22 19:51:47 -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
EliteMasterEric
aea9213eea Make sure the BPM label gets updated properly 2024-03-22 03:04:33 -04:00
EliteMasterEric
2b477c9bd1 Make Conductor a lazy instance 2024-03-22 02:47:56 -04:00
EliteMasterEric
4524b66170 Only show easy/normal/hard in story mode for now 2024-03-22 02:47:43 -04:00
EliteMasterEric
d50ff73d3c Registries now get added to the Flixel console (and get lazy instantiated so they don't start before the game does) 2024-03-22 02:47:21 -04:00
Cameron Taylor
f7acee94cd Merge branch 'rewrite/master' into feature/freeplay-album-art 2024-03-21 23:37:20 -07:00
Cameron Taylor
80c938af4f fix for the album roll to come in only once bf hand hits 2024-03-21 23:34:03 -07:00
Cameron Taylor
433d4968da change to elasticOut 2024-03-21 23:32:07 -07:00
Eric
fe2e272abb Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-22 00:17:03 -04:00
EliteMasterEric
2b91c0f926 Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening 2024-03-22 00:06:55 -04:00
EliteMasterEric
5e0de6d1ce Fix some issues with events unintentionally sharing data after being edited via the toolbox. 2024-03-21 23:57:26 -04:00
Eric
662688023a Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-21 22:57:18 -04:00
EliteMasterEric
efa0e103b0 Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars 2024-03-21 21:54:22 -04:00
EliteMasterEric
2069bf1d89 Merge remote-tracking branch 'origin/rewrite/master' into soundtray 2024-03-21 21:49:04 -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
1f81e92827 Scrapped the weird FlxAltasSprite stuff and just used a tween. Also fixed some bugs with story menu 2024-03-21 00:38:52 -04:00
EliteMasterEric
3975d34b70 Fix scoring lerp issue on story menu. 2024-03-20 23:06:32 -04:00
Cameron Taylor
99cb7263ca Merge pull request #399 from FunkinCrew/bugfix/html5-video-pausing
Rework HTML5 video cutscenes to properly support the pause menu and volume controls.
2024-03-20 18:33:25 -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
Cameron Taylor
186fdfdead Merge branch 'a-bot-bars' of github.com:FunkinCrew/Funkin-secret into a-bot-bars 2024-03-19 13:05:12 -07:00
Cameron Taylor
4eea9b76e7 idk assets revert this if I busted shit here lol 2024-03-19 13:04:58 -07:00
EliteMasterEric
42eec66753 Rework HTML5 video cutscenes to properly support the pause menu and volume controls. 2024-03-19 15:56:00 -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
e4eb543fa7 Fix a bug where title music starts blaringly loud. 2024-03-15 21:53:07 -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
Cameron Taylor
d68ea0eb46 lil polish 2024-03-14 19:40:07 -07:00