cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-12 00:15:10 +00:00
Code Issues Releases Wiki Activity
2987 commits 30 branches 20 tags 3 GiB
Commit graph

2987 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 0f9ecda2a1 Merge branch 'rewrite/master' into html5/asset-optimization 2024-04-09 20:25:37 -04:00
Cameron Taylor 1058181cc9 assets submod 2024-04-09 20:25:33 -04:00
Cameron Taylor 56623166b3 Merge pull request #472 from FunkinCrew/bugfix/linux-openal-crash 
Fix segmentation fault on Linux by rebuilding Lime.
 2024-04-09 20:15:39 -04:00
Cameron Taylor f00c6085e4 Merge pull request #477 from FunkinCrew/bugfix/song-compile-define 
Fix loading issue tied to -DSONG compile define.
 2024-04-09 20:15:24 -04:00
Cameron Taylor 2d98351a5c Merge pull request #480 from FunkinCrew/bugfix/week-3-stuff 
Main menu fix and Week 3 train fix
 2024-04-09 20:14:22 -04:00
Cameron Taylor eb752c242f assets submod 2024-04-09 20:13:59 -04:00
EliteMasterEric dbcbb73338 Main menu fix and Week 3 train fix 2024-04-09 15:10:58 -04:00
EliteMasterEric 6d374c7af9 Fix loading issue tied to -DSONG compile define. 2024-04-08 18:39:51 -04:00
EliteMasterEric 9a7a385af1 Fix segmentation fault on Linux by rebuilding Lime. 2024-04-06 01:11:27 -04:00
EliteMasterEric 2462bd2d99 Update assets submodule 2024-04-05 22:05:34 -04:00
Cameron Taylor 3b87ecf6f5 Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization 2024-04-05 19:59:25 -04:00
Cameron Taylor da4f1fb424 remove difficulty stars 2024-04-05 19:47:33 -04:00
EliteMasterEric a6d44b1f15 Removed many unused assets to optimize bandwidth usage. 2024-04-05 19:43:52 -04:00
Cameron Taylor af8a37d299 assets submod 2024-04-05 19:33:24 -04:00
Cameron Taylor 90f53a78c1 Merge pull request #470 from FunkinCrew/bugfix/results-gf-cam-zoom 
Readd GF camera zoom into results state.
 2024-04-05 16:43:47 -04:00
Cameron Taylor a8b266f772 Merge pull request #471 from FunkinCrew/bugfix/pico-knife-sound 
Fix various audio issues in Weekend 1
 2024-04-05 16:43:16 -04:00
Cameron Taylor d9b5e2c80f Merge branch 'rewrite/master' into bugfix/pico-knife-sound 2024-04-05 16:42:45 -04:00
Cameron Taylor ab2c4bf20b assets submod 2024-04-05 16:42:14 -04:00
Cameron Taylor 3464ce336f Merge pull request #468 from FunkinCrew/feature/new-album-art-3 
Add new album roll animation (again)
 2024-04-05 16:41:30 -04:00
Cameron Taylor fe52fdfbad assets submod 2024-04-05 16:40:37 -04:00
EliteMasterEric ab18c64821 Fix various audio fixes 2024-04-05 03:33:15 -04:00
EliteMasterEric 95434018f7 Readd GF camera zoom into results state. 2024-04-05 02:56:47 -04:00
Eric fd88ebef63 Merge pull request #467 from FunkinCrew/retro-fade 
small fade polish for week 8 convos
 2024-04-05 02:47:10 -04:00
Eric 7124249a3f Merge pull request #437 from FunkinCrew/bugfix/quick-camera-fixes 
Camera system internal and UI fixes
 2024-04-05 02:46:33 -04:00
EliteMasterEric 9c8ab72494 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes 2024-04-05 02:45:23 -04:00
EliteMasterEric 08e8530ad4 Fix SetCameraBopSongEvent to be additive 2024-04-05 02:44:44 -04:00
EliteMasterEric a764112bd4 Removed many unused assets to optimize bandwidth usage. 2024-04-05 01:24:03 -04:00
Eric 93e5e59d57 Merge pull request #433 from FunkinCrew/hl-compiles 
shader var renames for hashlink
 2024-04-04 18:23:44 -04:00
EliteMasterEric e35eb63d53 Merge branch 'rewrite/master' into hl-compiles 2024-04-04 18:16:07 -04:00
EliteMasterEric 823baa3326 Add new album roll animation (again) 2024-04-04 16:30:04 -04:00
Cameron Taylor acb58a6b49 remove sitelock 2024-04-04 05:41:44 -04:00
Cameron Taylor 926a8fb71d Merge pull request #459 from FunkinCrew/feature/results-screen-score 
Feature/results screen score
 2024-04-04 05:38:58 -04:00
Cameron Taylor 64cab4d137 removed duplicate merge 2024-04-04 05:37:48 -04:00
Cameron Taylor 8f3406cb0e Merge branch 'rewrite/master' into feature/results-screen-score 2024-04-04 05:34:29 -04:00
Cameron Taylor 894ca98755 assets submod 2024-04-04 05:33:58 -04:00
Cameron Taylor 5c1b6d9848 Merge pull request #462 from FunkinCrew/bugfix/chart-editor-weekend-1 
Bugfix/chart editor weekend 1
 2024-04-04 05:32:50 -04:00
Cameron Taylor 544dcdf809 Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1 2024-04-04 05:32:26 -04:00
Cameron Taylor cdf15b3431 assets submod 2024-04-04 05:32:21 -04:00
Cameron Taylor ec47ee4285 Merge pull request #461 from FunkinCrew/bugfix/debuggercheckbox-crash 
Prevent a crash trying to open a non-existant debugger checkbox.
 2024-04-04 05:30:41 -04:00
Cameron Taylor 3cb1f65e1d Merge pull request #465 from FunkinCrew/bugfix/miss-judgement 
Hide miss popups when hitting ~160ms
 2024-04-04 05:30:23 -04:00
Cameron Taylor 57a5973c2c small fade polish for week 8 convos 2024-04-04 05:22:44 -04:00
Cameron Taylor d82b1658c0 Merge pull request #463 from FunkinCrew/bugfix/week-6-polymod-crashes 
Fix Polymod errors in Week 6.
 2024-04-04 04:58:34 -04:00
Cameron Taylor 39d92eb09d fast loading on preloader 2024-04-04 04:55:27 -04:00
Cameron Taylor 67cd4e40be Merge pull request #464 from FunkinCrew/bugfix/hide-freeplay-menu-rating 
Hide Rating on the right side of the items in Freeplay
 2024-04-04 04:49:55 -04:00
Cameron Taylor eed8299cfd Merge branch 'rewrite/master' into bugfix/hide-freeplay-menu-rating 2024-04-04 04:47:45 -04:00
Cameron Taylor 26ed30e88c Merge pull request #452 from FunkinCrew/preloader-polish 
stereo preloader in progress
 2024-04-04 04:47:03 -04:00
Cameron Taylor 99cdb62175 updated color 2024-04-04 04:46:38 -04:00
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
Cameron Taylor a4f8cb7a59 Merge pull request #460 from FunkinCrew/save-merging-fix 
Fix issue with deepMerge() that corrupted saves.
 2024-04-04 03:39:58 -04:00