cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity
3749 commits 31 branches 21 tags 3 GiB
Commit graph

369 commits

Author SHA1 Message Date
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
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 51a44d4810 persistent draw false for results screen (fixes FUNK-256) 2024-06-01 23:36:57 -04:00
Cameron Taylor c322e2aeef Merge branch 'rewrite/master' into feature/results-freeplay-transition 2024-05-30 21:05:32 -04:00
Eric 2380058820
Merge pull request #2328 from nebulazorua/new-judge-applying 
New judge application logic
 2024-05-30 16:10:17 -04:00
EliteMasterEric b7a828e7d8 Make Freeplay use correct ranks, play the slam animation after Results, new Results music 2024-05-30 05:25:51 -04:00
Cameron Taylor 5adeada357 Merge branch 'gamerbross/scripted-stage-tostring' into develop-0.4.0 2024-05-29 16:49:12 -04:00
Cameron Taylor 827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
Burgerballs eb2b143a1c
Merge branch 'develop' into scroll-speed-fix 2024-05-24 17:23:45 +01:00
Burgerballs b40bb98bb4
Merge branch 'develop' into scroll-speed-fix 2024-05-23 22:44:25 +01:00
EliteMasterEric 30fd86befb Merge branch 'feature/charter-in-pause-menu' into develop-0.4.0 2024-05-22 12:01:27 -04:00
EliteMasterEric 42ab0b74e3 Merge branch 'feature/results-clear-rank' into develop 2024-05-22 11:40:00 -04:00
Keoiki 4e47bfe68b Fix Note Styles in PlayState & Chart Editor 2024-05-21 23:52:40 +03:00
etvx86 9968c8eabc
Fix some trace typos 2024-05-20 10:42:17 -04:00
EliteMasterEric faf7a0643c Tinkered with ghost tapping some, leaving it off for now tho. 2024-05-19 01:47:36 -04:00
EliteMasterEric b6b93bb0c6 Added clear percent, rank name, and background text. 2024-05-17 20:26:34 -04:00
gamerbross f1a0692c51 Fix ChartingState GameOver Crashes 2024-05-15 22:50:34 +02:00
Burgerballs eaf998adf7 curse burgerballs 2024-05-15 17:24:04 +01:00
Burgerballs 96de434d75 multiplicative added!! + sum tween fixes 2024-05-15 17:17:09 +01:00
nebulazorua e462b04b59 does notesplash 2024-05-15 20:46:08 +08:00
Cameron Taylor 5e70d9fcef
Merge pull request #2390 from ImCodist/polish/game-over-transition 
Polish for the transition from GameOverSubState back into PlayState.
 2024-05-14 21:32:19 -04:00
Burgerballs 5fd2ea0bcf optimization of the cleary boy (: 2024-05-10 21:37:46 +01:00
Burgerballs a5700b37e1 awesome shit (see desc) 
No longer Additive, it just sets the scroll speed

Now you can set it to either strumline
 2024-05-10 21:23:35 +01:00
Burgerballs edfde606a1 magical machine of death 2024-05-09 17:51:03 +01:00
codist bfaa4626f8 Polish for the transition from GameOverSubState back into PlayState. 2024-05-09 01:10:53 -04:00
nebulazorua 4b500f78e1 Revert change because i forgot to do it in a new branch oriignally lol 2024-05-08 20:30:47 +08:00
nebulazorua 2eaea3cdc5 Apply judgements through a seperate function to applyScore 
Also adds more to the HitNoteScriptEvent, such as the noteDiff and also isComboBreak.
noteDiff is important as it lets you create stuff like notes with reduced hitboxes (i.e mines/"hurt notes") or millisecond hit displays. isComboBreak lets you set whether the judge combo broke, so you could in theory create custom judgements in scripts now with these changes (killer reimplementation in scripts? more likely than you'd think!)
 2024-05-08 20:26:17 +08:00
nebulazorua f5143c2d78 this is better 2024-05-08 19:56:13 +08:00
nebulazorua 6fdc090ecc i have accidentally done this and wiped out my chart many times 2024-05-08 19:53:47 +08:00
EliteMasterEric 5e63832a87 Revert "Moved scroll speed to an instance variable" 
This reverts commit 6e5171b766.
 2024-05-02 23:06:01 -04:00
EliteMasterEric 23a27dd36e Implement onSongLoaded script event (with access to notes and events) 2024-05-02 04:11:27 -04:00
EliteMasterEric 6e5171b766 Moved scroll speed to an instance variable in PlayState (for da modders :P) 2024-05-01 22:39:13 -04:00
Cameron Taylor aaeb77a1f5 preventDefaultKeys for PreciseInputManager, and just use the FlxG.keys version 2024-05-01 17:23:22 -04:00
EliteMasterEric 079b1f327a Fix two crashes thanks to a crash report 2024-04-30 23:24:43 -04:00
Cameron Taylor 23dd9937ec black camera bg 2024-04-30 07:21:45 -04:00
EliteMasterEric 01b80ab5c8 Merge remote-tracking branch 'origin/input-offsets' into rewrite/master 2024-04-28 19:07:44 -04:00
EliteMasterEric dd90d430ee Replace the zoom with a fade (for now) 2024-04-24 23:50:19 -04:00
EliteMasterEric e0721b901e Fix a bug where negative visual offsets would break the countdown. 2024-04-24 21:57:23 -04:00
EliteMasterEric f474bc32a5 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-04-24 21:54:45 -04:00
EliteMasterEric b6247c933a Disable chart editor on web until it's fixed. 2024-04-24 16:00:50 -04:00
EliteMasterEric 84c3fd452b Update Weekend 1 cutscenes to use the instanced Conductor 2024-04-20 02:11:04 -04:00
Cameron Taylor 678dbc0ab7 Merge branch 'rewrite/master' into a-bot-bars 2024-04-19 15:11:28 -04:00
FabsTheFabs 351cb8cbaa popupstuff changes + make combopopup able to be edited outside of playstate 2024-04-19 14:14:33 -04:00
Cameron Taylor 035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor 93ae7692c8 Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes 2024-04-19 13:55:01 -04:00