Commit graph

1994 commits

Author SHA1 Message Date
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
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
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
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
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
EliteMasterEric
42eec66753 Rework HTML5 video cutscenes to properly support the pause menu and volume controls. 2024-03-19 15:56:00 -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
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
Cameron Taylor
82383018f6 funkin soundtray 2024-03-14 19:27:07 -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
3aada18a59 title screen volume fix 2024-03-14 04:03:33 -07:00
Cameron Taylor
c4550ca773 Merge branch 'rewrite/master' into bugfix/github-force-debug 2024-03-14 03:09:05 -07:00