Commit graph

4387 commits

Author SHA1 Message Date
Eric
75bc63e1d0 Merge pull request #391 from FunkinCrew/title-music-vol-fix
title screen volume fix
2024-03-22 01:32:02 -04:00
Eric
fe2e272abb Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-22 00:17:03 -04:00
Eric
d481830323 Merge pull request #396 from FunkinCrew/feature/focusCameraTweening
Camera easing upgrades
2024-03-22 00:07:57 -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
Eric
96849a7ada Merge pull request #382 from FunkinCrew/tiny-checkstyle-fix
fixes capitalization in checkstyle settings
2024-03-21 22:56:12 -04:00
EliteMasterEric
efa0e103b0 Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars 2024-03-21 21:54:22 -04:00
Cameron Taylor
c8dace8c1c Merge pull request #401 from FunkinCrew/feature/weekend-1-audio-remaster
Update 2hot, Lit Up, and Blazin to polished audio
2024-03-21 21:53:13 -04:00
Cameron Taylor
ad3006b17e Merge branch 'rewrite/master' into feature/weekend-1-audio-remaster 2024-03-21 18:52:50 -07:00
Cameron Taylor
d96ea5e895 submod update 2024-03-21 18:51:18 -07:00
Eric
72d7c1273d Merge pull request #392 from FunkinCrew/soundtray
funkin soundtray
2024-03-21 21:49:27 -04:00
EliteMasterEric
2069bf1d89 Merge remote-tracking branch 'origin/rewrite/master' into soundtray 2024-03-21 21:49:04 -04:00
Cameron Taylor
407df10929 Merge pull request #403 from FunkinCrew/bugfix/pause-menu-stress-diff
Fix an issue where hidden difficulties could end up in the difficulty list.
2024-03-21 21:48:15 -04:00
EliteMasterEric
038a92c314 Update assets submodule 2024-03-21 20:04:10 -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
9db9f44924 Update assets submodule 2024-03-21 00:38:59 -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
70975cdb59 Merge pull request #398 from FunkinCrew/bugfix/html5-script-fixes
HTML5 script fixes
2024-03-20 18:40:56 -04:00
Cameron Taylor
a93aa6c68d submod update 2024-03-20 15:40:33 -07: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
50b17b3dca Update 2hot, Lit Up, and Blazin to polished audio 2024-03-19 23:25:22 -04:00
Eric
41b9ba9bce Merge branch 'rewrite/master' into a-bot-bars 2024-03-19 22:33:02 -04:00
Cameron Taylor
e89f310d26 Merge pull request #394 from FunkinCrew/bugfix/teeny-senpai-would-you-step-on-him-for-one-dollar
Fix Week 6 tiny characters
2024-03-19 16:16:27 -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
34cb3ceb24 Update assets submodule 2024-03-19 00:53:01 -04:00
EliteMasterEric
4d1bcbc193 Update assets submodule 2024-03-19 00:29:01 -04:00
EliteMasterEric
a7780474fe Improve error handling for bad script superclasses 2024-03-19 00:28:25 -04:00
EliteMasterEric
a8ebdc5ee8 Update Polymod to fix several bugs on web 2024-03-18 22:27:19 -04:00
EliteMasterEric
3a35be916b A bunch of checkstyle fixes 2024-03-16 22:20:22 -04:00
EliteMasterEric
874a2d9e86 Formatting cleanup in assets folder 2024-03-16 19:24:05 -04:00
Jenny Crowe
494a3c9e86 Bugfixes. New additive zoom mode for camera tweening. 2024-03-16 08:38:10 -07:00
EliteMasterEric
efd0bef89f Remove checkbox that should have been removed earlier. 2024-03-16 01:08:20 -04: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
5733386519 Update Polymod to improve error handling in scripts. 2024-03-16 00:55:05 -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
EliteMasterEric
4866667e1c ANNIHILATE M.I.L.F. custom gameplay 2024-03-15 02:25:34 -04: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
EliteMasterEric
e3b09bc839 Clean up the classic MILF script 2024-03-14 20:41:31 -04: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