cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity
4381 commits 30 branches 20 tags 6.8 GiB
Commit graph

832 commits

Author SHA1 Message Date
EliteMasterEric a071e90746 Added alt vocal offsets feature, disabled alt instrumentals on Pico mix (for now?) 2024-07-22 20:52:03 -04:00
EliteMasterEric 1515719a0f Implemented instrumental select (you need to beat the song as Pico first)! 2024-07-22 18:38:22 -04:00
Cameron Taylor bfa0bafc6f
Merge pull request #675 from FunkinCrew/bugfix/hud-hiding 
Several tiny bug fixes
 2024-07-19 19:10:28 -04:00
EliteMasterEric 7547875535 Allow hiding HUD on launcher builds. 2024-07-18 23:27:41 -04:00
EliteMasterEric 558ec53532 Switch songs with no difficulties from an error to a warning. 2024-07-18 23:27:12 -04:00
Cameron Taylor f90c2bda99
Merge branch 'rewrite/master' into anysad/tutorial-hey-events 2024-07-18 15:08:10 -04:00
Cameron Taylor b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
 2024-07-18 15:07:52 -04:00
EliteMasterEric 416d60000f Implement Nene Christmas, and fix Nene offsets on other stages. 2024-07-15 06:30:10 -04:00
EliteMasterEric 6116ec3639 Some more fixes for offsets handling and stuffs 2024-07-12 22:31:04 -04:00
EliteMasterEric 492874ce32 Merge branch 'sword352/indirect-anim-offsets' into bugfix/character-offset-fixes 2024-07-12 21:41:25 -04:00
EliteMasterEric d4cbe74939 Smaller fixes tied to note kinds 2024-07-12 21:40:46 -04:00
EliteMasterEric f76309c91e Update rendering for custom note styles 2024-07-12 04:13:20 -04:00
lemz 1fe44fa368 add from 2024-07-12 02:13:23 -04:00
lemz 4746c1da0e checking empty suffix is stupid 2024-07-12 02:13:22 -04:00
lemz f9bccb057a use suffixes instead of pixel boolean 2024-07-12 02:13:22 -04:00
lemz 492af8add4 String works now 2024-07-12 02:13:21 -04:00
lemz 44d9785317 editing them works now 
still need to implement String and do some testing
 2024-07-12 02:13:21 -04:00
lemz c41d846df5 store params in chart 
chart editor still doesnt fully work
 2024-07-12 02:13:20 -04:00
lemz 764cdee63d add more options 2024-07-12 02:13:20 -04:00
lemz 0fe726cefa fix min, max 2024-07-12 02:13:20 -04:00
lemz d9b9854d91 add params to toolbox 
not completely finished
 2024-07-12 02:13:18 -04:00
lemz 9a563ec46b switch seemingly doesnt work 2024-07-12 02:13:18 -04:00
lemz 94fe4a06b9 Update NoteKind.hx 2024-07-12 02:13:18 -04:00
lemz c8d019da2f Update NoteKind.hx 2024-07-12 02:13:17 -04:00
lemz acd8912d16 Add Custom Params For NoteKind 
still need to implement the chart editor stuff
 2024-07-12 02:13:17 -04:00
lemz 928de7b8eb check for pixel style if necessary 2024-07-12 02:13:16 -04:00
lemz c4855c0ca8 fix hold note 2024-07-12 02:13:15 -04:00
lemz ca2cbb44f5 display custom note style in chart editor 2024-07-12 02:13:14 -04:00
lemz 328e590f92 hold assets are updated aswell 2024-07-12 02:13:13 -04:00
lemz b6eda8e498 remove note kind logic from playstate 2024-07-12 02:13:12 -04:00
lemz 14771e72de no more note getter 2024-07-12 02:13:12 -04:00
lemz 3f39d9509c make custom note style less clunky 2024-07-12 02:13:12 -04:00
lemz e3e4e9fac0 helper function 2024-07-12 02:13:11 -04:00
lemz c83e505f5b onUpdate, etc. works now too 2024-07-12 02:13:11 -04:00
lemz 606d9d4af4 Update NoteKindManager.hx 2024-07-12 02:13:11 -04:00
lemz 134b467876 rename stuff 2024-07-12 02:13:10 -04:00
lemz a7482410b9 add note kind scripts 2024-07-12 02:13:10 -04:00
gamerbross e6c9767800 Revert camCutscene rename 2024-07-11 22:48:21 -04:00
gamerbross e23e6c160d Fix references to camCutscene 2024-07-11 22:48:20 -04:00
gamerbross 17f5a06256 Add camOther to fix zooms on pause and stickers 2024-07-11 22:48:20 -04:00
EliteMasterEric 4a7545a0db Remove empty function. 2024-07-11 21:45:06 -04:00
anysad 18b795d4f7 Add HEY! song events to Tutorial 2024-07-11 21:39:20 -04:00
Cameron Taylor 5a26ece9d6
Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Cameron Taylor 7cd19a0135
Merge pull request #656 from FunkinCrew/feature/nene-combo-anims 
Implement combo animations for Nene + other changes
 2024-07-11 19:52:01 -04:00
Cameron Taylor 966fce3426 Merge branch 'rewrite/master' into feature/nene-combo-anims 2024-07-11 19:51:13 -04:00
Cameron Taylor cffe41985d
Merge pull request #663 from FunkinCrew/gamerbross/hold-note-forced-alpha 
[PUBLIC PR] Fix a bug where mods can't change the transparency of hold notes
 2024-07-11 19:48:35 -04:00
Cameron Taylor 19fd8b5e4e Merge branch 'gamerbross/chart-editor-key' into rewrite/master 2024-07-11 19:45:10 -04:00
gamerbross 7b9e4a0542 Fix F5 chart not reloading 2024-07-11 03:41:51 -04:00
gamerbross 8107d1a290 Remove SustainTrail forced alpha 2024-07-10 20:18:29 -04:00
EliteMasterEric 2ae6882241 Swappable album art and updated FlxAnimate 2024-07-10 17:25:52 -04:00
EliteMasterEric d8572cd323 Thank you loggo 2024-07-10 14:23:50 -04:00
EliteMasterEric 98ed4bd843 Implement Nene/GFXmas combo anims 2024-07-09 04:21:14 -04:00
EliteMasterEric cb4620d33a Fix background props not bopping on Week 5 2024-07-09 04:20:42 -04:00
Cameron Taylor 7a653707a8
Merge pull request #641 from FunkinCrew/maybemaru/pixels-per-ms 
[PUBLIC PR] Make use of Constants.PIXELS_PER_MS consistent.
 2024-07-08 22:12:18 -04:00
Cameron Taylor 6e5c6a8f6d assets submod 2024-07-08 21:51:44 -04:00
EliteMasterEric a9aa142b8d Added more pico results + charts 2024-07-07 04:10:37 -04:00
Cameron Taylor c9c94a5fda note fadein fix 2024-07-04 15:55:19 -04:00
Cameron Taylor 4d9b506380
Merge pull request #645 from FunkinCrew/gamerbross/char-danceevery 
[PUBLIC PR + CHANGES] Fix danceEvery for characters
 2024-07-04 15:08:51 -04:00
Cameron Taylor 67b1c3864e Merge branch 'rewrite/master' into feature/character-anim-fixes 2024-07-04 15:07:07 -04:00
Cameron Taylor eddfa23955
Merge pull request #644 from FunkinCrew/abnormalpoof/cutscene-auto-pause 
[PUBLIC PR] Automatically pause video cutscenes when tabbing away from the game
 2024-07-04 14:52:46 -04:00
Cameron Taylor a7cfae8545 mer 2024-07-04 14:48:24 -04:00
EliteMasterEric 7fbc765403 Implement Pico results (good animation) 2024-07-04 03:32:50 -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
EliteMasterEric ad57e64994 Working Pico DJ 2024-07-03 18:03:31 -04:00
EliteMasterEric 72a00b9ae2 Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-07-03 18:01:49 -04:00
EliteMasterEric b022581e23 Make danceEvery a float precise up to 0.25 beats (1 step) 2024-06-28 23:25:59 -04:00
gamerbross 6bf28a5416 Implement danceEvery for Characters 2024-06-28 22:57:44 -04:00
AbnormalPoof 9d9d7a853c video cutscene autopause magic 2024-06-28 22:36:01 -04:00
EliteMasterEric 84dd1cd3b9 Fix several character animation issues 2024-06-28 22:29:59 -04:00
MaybeMaru 16d64991ed Add missing constants 2024-06-27 03:56:41 -04:00
gamerbross a7bdf23832 Fix chart reset when charting and pressing chart key 2024-06-26 20:52:32 -04:00
Cameron Taylor dd30012d80
Merge pull request #637 from FunkinCrew/hundrec/tankman-chart-editor-fix 
[PUBLIC PR] Fix tankmanpixel icon in Chart Editor
 2024-06-26 20:41:24 -04:00
Hundrec 08d35eb00d
Fix tankmanpixel icon in Chart Editor 2024-06-25 18:07:09 -04:00
Cameron Taylor 8a144352a0 remove bopper trace 2024-06-25 13:56:31 -04:00
Cameron Taylor 1757532097 more retro week 6 stuff 2024-06-25 13:56:31 -04:00
Cameron Taylor 39c3af58f2 fix: bf v pose playing during a gameover 2024-06-25 13:56:31 -04:00
EliteMasterEric d44275c2c7 Fix a bug where songs with no notes would crash the results screen. 2024-06-24 14:40:55 -04:00
EliteMasterEric 9b3a748f37 Working Pico DJ 2024-06-20 16:17:53 -04:00
EliteMasterEric 60e741434c Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-06-18 17:56:24 -04:00
Cameron Taylor c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
DM-kun da61b72c48 crash fix 2024-06-10 16:21:41 -04:00
gamerbross 8f44d9606d Remove unnecessary scrollMenu sounds + adjust volume 2024-06-10 13:17:38 -04:00
Cameron Taylor 4691e3d249 Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master 2024-06-10 12:26:47 -04:00
Eric 9a8ba4183e
Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
gamerbross cd485213db Pause Camera Follow when pausing 2024-06-08 02:26:17 +02:00
gamerbross ee6c4478a9 Use FlxG.camera instead of camGame 2024-06-08 02:02:54 +02:00
Hundrec 393355b512
Fix botplay sustain release bug 
Copied opponent's holdTimer code to the player's side
 2024-06-07 19:59:02 -04:00
EliteMasterEric d39f3dc1e8 Merge branch 'main' into develop 2024-06-07 19:54:30 -04:00
EliteMasterEric ca345e6c4f Play song IDs based on the chart file's "instrumental" field, not the variation ID. 2024-06-06 21:38:00 -04:00
Cameron Taylor 7ef14b24c7 Merge branch 'prshit' into rewrite/master 2024-06-06 20:13:36 -04:00
Cameron Taylor 73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event 2024-06-06 19:49:47 -04:00
Cameron Taylor 02be65c383
Merge branch 'rewrite/master' into pursnake/character-scale 2024-06-06 19:47:48 -04:00
EliteMasterEric a81b6b2d6e Fix issue with rendering the grid in 3/4 time signature 2024-06-06 16:44:20 -04:00
FabsTheFabs 642f272bce freeplay polish + new text 2024-06-06 01:49:33 +01:00
Cameron Taylor e01fa2c85e Merge branch 'result-percentage' into rewrite/master 2024-06-05 17:11:47 -04:00
Cameron Taylor eaa63196b3 fix for dadbattle appearing on freeplay 2024-06-05 17:10:53 -04:00
Cameron Taylor 6e761ba156 hardcode the songname position 2024-06-05 14:47:29 -04:00
Cameron Taylor fa1fafba68 less effin traces 2024-06-05 14:13:06 -04:00
EliteMasterEric 5dda95c69b Fix some display issues with the clear percent in the results screen. 2024-06-05 00:40:14 -04:00