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

4244 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor
737a679196 merge conflict fixins 2024-08-29 15:26:35 -04:00
Cameron Taylor
825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor
364a5d5a55 hmm flxanimate version fix 2024-08-29 15:06:11 -04:00
Cameron Taylor
0392eddba6 gf/nene char select mini optimization 2024-08-29 14:32:10 -04:00
Cameron Taylor
b27aa4c94d Merge branch 'rewrite/master' into feature/pico-playable-christmas 2024-08-29 13:40:56 -04:00
EliteMasterEric
560badd6b5 File optimization and Expansion 2 album art 2024-08-29 06:59:10 -04:00
Cameron Taylor
1fbca9ab6a Merge branch 'bugfix/various-develop-fixes' into rewrite/master 2024-08-28 16:32:50 -04:00
Cameron Taylor
5d590654f4 assets submod 2024-08-28 16:32:41 -04:00
Cameron Taylor
2effd977f4 Merge branch 'feature/cory-chart-revisions' into rewrite/master 2024-08-28 16:31:07 -04:00
Cameron Taylor
8385c2b8ca
Merge pull request #707 from FunkinCrew/flixel-bump 
bump flixel to latest
 2024-08-28 16:30:33 -04:00
EliteMasterEric
452747139e Updated Pico and Erect charts, sent on August 27th 2024-08-28 09:41:58 -04:00
EliteMasterEric
6cff1efc72 Fix several compile errors, and update assets submodule. 2024-08-28 06:45:18 -04:00
EliteMasterEric
e7fca119f8 Logic + animations for new unlocks 2024-08-28 06:11:01 -04:00
EliteMasterEric
1fb5c31c22 Don't apply global offset twice (NOTE: this may break Nene again!) 2024-08-28 06:09:34 -04:00
EliteMasterEric
7e39687994 Data driven char select grid positions 2024-08-28 06:09:14 -04:00
EliteMasterEric
16a6dba9df Pico Fist Pump animation (with loss animation) 2024-08-28 06:08:30 -04:00
EliteMasterEric
2e7eabc494 Remember character ID between visits to Freeplay, plus some fixes to prevent spamming keys 2024-08-28 06:05:28 -04:00
EliteMasterEric
570e672296 Fix magenta flicker on the main menu. 2024-08-28 06:03:26 -04:00
EliteMasterEric
152820f2e1 Fix some warnings with props in StoryMenu 2024-08-28 06:03:12 -04:00
EliteMasterEric
89402f8bb8 Fix a bug where Bot Play could miss (via lag or the player mashing) and lose the song. 2024-08-28 05:47:34 -04:00
EliteMasterEric
ccabded2cc Fix warning related to bad asset caching for judgements. 2024-08-28 05:43:41 -04:00
EliteMasterEric
af93da6cd4 Fixes to Chart Editor toolboxes 2024-08-28 05:43:23 -04:00
EliteMasterEric
b0f04779dc Fix to Spooky icon in Freeplay menu 2024-08-28 05:43:01 -04:00
EliteMasterEric
382af3b485 Reimplement ghost tapping (disabled via compile define) 2024-08-28 05:42:14 -04:00
EliteMasterEric
469ff6690f Fix a crash when skipping in the song before it started. 2024-08-28 05:40:50 -04:00
CheemsAndFriends
353aa42f5b Fixes for the atlasSprite bizz 2024-08-28 02:48:56 +02:00
Cameron Taylor
9b712ce2aa bump flixel 2024-08-27 16:13:52 -04:00
Cameron Taylor
71ecc8f651 Merge branch 'art-repo-update' into rewrite/master 2024-08-27 15:25:42 -04:00
Cameron Taylor
861b869b2d fonts fix for mac 2024-08-27 15:23:27 -04:00
Cameron Taylor
ce62c240fa Merge branch 'rewrite/master' into bugfix/nene-pico-offsets 2024-08-27 14:40:56 -04:00
Cameron Taylor
f10ff1d80a
Merge pull request #706 from FunkinCrew/EliteMasterEric-patch-1 
Display syntax formatting in project.hxp on Github.com
 2024-08-27 14:26:38 -04:00
Cameron Taylor
a7334d8ff9
Merge pull request #705 from FunkinCrew/bugfix/week-4-boppers 
Fix a bug where stage props would receive events twice
 2024-08-27 14:26:19 -04:00
Eric
82496299e7
Display syntax formatting in project.hxp on Github.com 2024-08-27 14:21:40 -04:00
Cameron Taylor
4990ac03a4
Merge pull request #703 from FunkinCrew/feature/project-hxp 
Rework project to use HXP
 2024-08-27 11:26:39 -04:00
Cameron Taylor
fd5d8aa196
Merge branch 'rewrite/master' into feature/project-hxp 2024-08-27 11:26:29 -04:00
EliteMasterEric
d02f632c0e Fix a bug where stage props would receive events twice 2024-08-27 04:54:02 -04:00
EliteMasterEric
df42ac7531 Fixed issues with Nene offsets in Pico mode 2024-08-27 04:20:49 -04:00
EliteMasterEric
5caba54e19 Update HScript to use the organization's fork 2024-08-27 02:33:17 -04:00
Cameron Taylor
dff87babe6 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-08-26 21:58:39 -04:00
Cameron Taylor
91e4043ce9 small hmm updates 2024-08-26 21:58:35 -04:00
Cameron Taylor
475a20ece8
Merge pull request #700 from FunkinCrew/bugfix/builds-2024-08 
ci build maintenance, august 2024 edition
 2024-08-26 18:11:05 -04:00
EliteMasterEric
200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
EliteMasterEric
6b9bdb5f2a Upgraded project file to HXP 2024-08-26 18:01:23 -04:00
EliteMasterEric
269f3ecfbe Updated haxelibs 2024-08-26 18:01:06 -04:00
EliteMasterEric
f2433bfdcc Updated CHANGELOG 2024-08-26 18:00:59 -04:00
EliteMasterEric
b51ba61d07 Update art submodule 2024-08-26 17:14:15 -04:00
mint
3c208ee143 git cleanup crew 2024-08-26 21:32:21 +02:00
mint
a778555a97 more debug info 2024-08-26 21:32:21 +02:00
mint
266bf939a9 haxelib 2024-08-26 21:32:21 +02:00
mint
514aa576ea haxelib 2024-08-26 21:32:21 +02:00