Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-11 16:51:21 -05:00
Code Issues Projects Releases Packages Wiki Activity
3863 commits 30 branches 20 tags 3 GiB
Commit graph

3863 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Cameron Taylor
3aada18a59 title screen volume fix 2024-03-14 04:03:33 -07:00
Cameron Taylor
4c35b1d74f Merge pull request #390 from FunkinCrew/bugfix/github-force-debug 
Fix some issues resulting in release builds breaking!
 2024-03-14 06:09:48 -04:00
Cameron Taylor
c4550ca773 Merge branch 'rewrite/master' into bugfix/github-force-debug 2024-03-14 03:09:05 -07:00
Cameron Taylor
0d2167d330 assets submod 2024-03-14 03:08:51 -07:00
Cameron Taylor
371f33d102 Merge pull request #389 from FunkinCrew/feature/new-lightning 
Replace Blazin' lightning with correct graphic
 2024-03-14 01:00:43 -04:00
Cameron Taylor
d017b8d0e5 Merge branch 'rewrite/master' into feature/new-lightning 2024-03-13 22:00:21 -07:00
Cameron Taylor
a21ce20e40 assets submod merge 2024-03-13 21:59:40 -07:00
Cameron Taylor
5c0e01dee2 Merge pull request #388 from FunkinCrew/feature/pico-flicker 
Arcade-style flicker when Pico gets hit by the can.
 2024-03-14 00:54:31 -04:00
Cameron Taylor
e0eb00d01a Merge branch 'rewrite/master' into feature/pico-flicker 2024-03-13 21:51:58 -07:00
Cameron Taylor
c48fcf1b88 Merge pull request #387 from FunkinCrew/feature/chart-editor-song-scripts 
Add option to enable scripts in Chart Editor playtest
 2024-03-14 00:27:35 -04: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
a6fecd05e0 assets submod 2024-03-13 18:58:18 -07:00
Cameron Taylor
59752f0d9a Merge pull request #385 from FunkinCrew/feature/debugger-popup-fixes 
Debugger popup fixes
 2024-03-13 21:54:54 -04:00
Cameron Taylor
c8b74ccce2 Merge branch 'rewrite/master' into feature/debugger-popup-fixes 2024-03-13 18:54:24 -07:00
Cameron Taylor
b3b397f810 Merge pull request #384 from FunkinCrew/bugfix/precache-library-assets 
Fix 2hot stuttering issues
 2024-03-13 21:48:28 -04: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
Jenny Crowe
8562c11c94 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening 2024-03-13 18:27:16 -07:00
EliteMasterEric
d22cb1a96f Fix some issues resulting in release builds breaking! 2024-03-13 17:38:00 -04:00
Hazel
238a11debd retrigger ci 2024-03-13 21:15:22 +01:00
EliteMasterEric
9328ac84cc New lightning graphic 2024-03-13 12:57:46 -04:00
EliteMasterEric
c67e64a8f5 Update Flixel and assets submodule 2024-03-13 12:07:19 -04:00
EliteMasterEric
a13dc6e585 Remove deprecated imports. 2024-03-13 12:07:06 -04:00