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

91 commits

Author SHA1 Message Date
CheemsAndFriends
a901677853 Merge branch 'feature/char-unlock' of https://github.com/FunkinCrew/Funkin-secret into feature/char-unlock 2024-09-06 06:33:01 +02:00
CheemsAndFriends
a61f40571d add wip bizz 2024-09-06 06:28:08 +02:00
Cameron Taylor
0e37cb9540 Merge branch 'rewrite/master' into bugfix/blazin-flxanimate-fixes 2024-09-05 00:31:47 -04:00
Cameron Taylor
5c44e61ce1 assets submod 2024-09-05 00:20:55 -04:00
EliteMasterEric
3a2ca6b525 Code changes to fix Blazin' 2024-09-04 09:58:04 -04:00
Cameron Taylor
bd144d6adb Merge branch 'rewrite/master' into bugfix/friday-fixes 2024-09-03 23:42:51 -04:00
FabsTheFabs
b58bd07fd2 rain shader recolor support 2024-09-03 19:16:58 +01:00
Cameron Taylor
498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
EliteMasterEric
7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
FabsTheFabs
0c809c828e color tint for angle mask shader 2024-08-30 01:03:11 +01:00
Cameron Taylor
825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
CheemsAndFriends
353aa42f5b Fixes for the atlasSprite bizz 2024-08-28 02:48:56 +02:00
EliteMasterEric
200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
FabsTheFabs
0d3fa41b29 blue fade shader 2024-08-23 13:35:50 +01:00
CheemsAndFriends
7f0f0efe46 initial Commit 2024-08-22 23:36:43 +02:00
Cameron Taylor
0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
FabsTheFabs
a0ab216617 merged rain shader stuff from 'feature/week2-erect-bg-rain' 2024-07-18 06:04:19 +01:00
FabsTheFabs
ad93706b1d adjust color shader 2024-07-18 05:23:37 +01:00
EliteMasterEric
2ae6882241 Swappable album art and updated FlxAnimate 2024-07-10 17:25:52 -04:00
Cameron Taylor
fdf52efdd1 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-07-08 22:10:52 -04:00
EliteMasterEric
a9aa142b8d Added more pico results + charts 2024-07-07 04:10:37 -04:00
EliteMasterEric
e32fcee77c Migrate results animations to JSON data so we can implement them per-character 2024-07-03 22:50:39 -04:00
FabsTheFabs
28068b1a86 updating more stuff 2024-07-01 22:17:55 -04:00
Cameron Taylor
1757532097 more retro week 6 stuff 2024-06-25 13:56:31 -04:00
Cameron Taylor
1e3ef61fc9 freeplay bg nicer AA and proper sizing 2024-06-11 15:57:45 -04:00
EliteMasterEric
d4f113df59 Fix a conflict between a shader variable name and a function on some graphics cards. 2024-05-08 14:23:33 -04:00
EliteMasterEric
9ffbc8479c Fix for another reported crash 2024-04-30 23:59:25 -04:00
EliteMasterEric
f474bc32a5 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-04-24 21:54:45 -04:00
Cameron Taylor
e33f14ea5c options screen menu bg fix 2024-04-24 12:11:37 -04:00
Cameron Taylor
6c63f84369 Merge branch 'rewrite/master' into bugfix/weekend-1-can-death-freeze 2024-04-23 04:14:41 -04:00
EliteMasterEric
7f18eb62d7 Moved can explosion animation to weekend1 library so it's preloaded. 2024-04-20 23:04:08 -04:00
EliteMasterEric
6f5c3a043f Fix crash caused when game tries to render disposed sprites during a Sticker transition. 2024-04-10 14:45:07 -04:00
Cameron Taylor
fe52fdfbad assets submod 2024-04-05 16:40:37 -04:00
EliteMasterEric
9a874d5293 Fix for weird HSV colors 2024-04-04 19:45:57 -04:00
EliteMasterEric
823baa3326 Add new album roll animation (again) 2024-04-04 16:30:04 -04:00
Cameron Taylor
77b65ba68c shader var renames for hashlink 2024-03-27 21:32:13 -04:00
EliteMasterEric
51d36ea25e Work in progress on fixing Boyfriend's spook/tv animations 2024-03-24 04:53:05 -04:00
Cameron Taylor
f7acee94cd Merge branch 'rewrite/master' into feature/freeplay-album-art 2024-03-21 23:37:20 -07: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
36a9c29720 Work in progress on custom album art for freeplay 2024-03-20 14:37:24 -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
66085ff867 Song scripts can now be (optionally) enabled in the Chart Editor playtest 2024-03-12 21:34:50 -04:00
EliteMasterEric
f7a3d43e54 Fixes to animation looping and holds 2024-03-02 22:46:13 -05:00
EliteMasterEric
0294ea0b79 Implemented FlxAnimate characters into Blazin'. 2024-03-01 08:13:06 -05:00
EliteMasterEric
8683900922 Fixes to cutscene pausing. 2024-02-28 03:53:36 -05:00
EliteMasterEric
5d030b8a31 Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu 2024-02-28 03:04:56 -05:00
EliteMasterEric
13d6ba378e Work in progress on fixing Week 6 2024-02-28 00:19:08 -05:00
EliteMasterEric
ddfb0c6a61 Working on more asset caching improvements. 2024-02-22 23:37:52 -05:00
EliteMasterEric
539b688055 Exploration in expanding FunkinSprite for optimization 2024-02-22 18:55:24 -05:00
EliteMasterEric
77ff261be1 Make functions non-inline so they work on HScript 2024-02-16 13:08:34 -05:00