cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-09 00:04:42 +00:00
Code Issues Releases Wiki Activity
2718 commits 3 branches 3 tags 3 GiB
Commit graph

2718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 74dc377b5d asset submod 2024-03-21 22:49:18 -07:00
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
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 105aca4707 Fix an issue where hidden difficulties could end up in the difficulty list. 2024-03-21 19:44:02 -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 50b17b3dca Update 2hot, Lit Up, and Blazin to polished audio 2024-03-19 23:25:22 -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
EliteMasterEric 42eec66753 Rework HTML5 video cutscenes to properly support the pause menu and volume controls. 2024-03-19 15:56:00 -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
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
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