1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 03:13:45 +00:00
Commit graph

4812 commits

Author SHA1 Message Date
Eric 598a3bea24
Merge branch 'develop' into fps-setting 2024-09-18 02:09:38 -04:00
Eric b03d320c12
Merge pull request #3139 from AbnormalPoof/patch-1
chore: Update ScriptedFunkinSprite.hx
2024-09-18 01:58:40 -04:00
EliteMasterEric 61d23b9985 Use branch of HXCPP 2024-09-17 20:56:54 -04:00
EliteMasterEric b70983a0e4 Build arguments for Tracy 2024-09-17 20:50:09 -04:00
Kade de07497ae3
Make addCharacter actually set the characters type 2024-09-17 17:29:12 -07:00
Lethrial ea9dab4b73 Update Main.hx 2024-09-18 00:25:20 +01:00
Michael f2b3f47e73 Disable input in CharSelect until stayFunky plays 2024-09-17 15:57:50 -07:00
dombomb64 6e33cac9ec ...Okay it wasn't that simple 2024-09-17 16:47:16 -04:00
Eric dab417b391
Merge branch 'rewrite/master' into kadedev/chart-editor-fixes 2024-09-17 16:15:02 -04:00
dombomb64 0706192cbe Fix note scaling with one simple trick! 2024-09-17 13:50:59 -04:00
Cameron Taylor 7fbbc5cf95 save artifacts on html5 and linux? 2024-09-17 04:48:30 -04:00
Cameron Taylor 4939b09fb0 manual build artifacts 2024-09-17 04:43:34 -04:00
AbnormalPoof aae7dcdada fix crash when opening urls 2024-09-16 23:35:23 -05:00
Til Tjardes e6525d0129 stop being on the kickstarter crack me 2024-09-16 20:44:29 -06:00
Eric 6efdbde8da
Merge branch 'develop' into fps-setting 2024-09-16 22:09:54 -04:00
Til Tjardes b7c3f5ac9f Chart Editor Icons are fixed now! 2024-09-16 20:04:04 -06:00
EliteMasterEric 811caf6b70 Suppress a spammy log trace 2024-09-16 21:54:33 -04:00
EliteMasterEric d710318830 Update HaxeUI 2024-09-16 21:54:24 -04:00
Eric 1fc835494d
Merge pull request #3020 from anysad/custom-popups-countdowns
[ENHANCEMENT] Custom Popups and Countdowns
2024-09-16 20:56:26 -04:00
EliteMasterEric 2e9223ec72 Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns 2024-09-16 20:50:13 -04:00
Kade 9624b57e44
This does fix it now 2024-09-16 17:23:49 -07:00
Kade 7d2b946e9c
depreciated screen X/Y to view X/Y 2024-09-16 17:13:14 -07:00
Kade 5a877a14a0
only show last two digits
digit
2024-09-16 17:13:13 -07:00
Kade 535ac0e528
add milliseconds to the playbar in charting state
remove laggy redundant traces

Revert "remove laggy redundant traces"

This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
2024-09-16 17:13:13 -07:00
Eric 35b5957715
Merge pull request #3007 from anysad/tutorial-hey-events
[CLEANUP] Softcode Tutorial HEY! events from code to JSON
2024-09-16 19:33:04 -04:00
EliteMasterEric e915b637c5 Merge remote-tracking branch 'origin/develop' into anysad/tutorial-hey-events 2024-09-16 19:09:58 -04:00
Eric f38a95bbf7
Merge branch 'develop' into fps-setting 2024-09-16 18:59:55 -04:00
Eric ebfce9f990
Merge pull request #2820 from gamerbross/bugfix/animation-editor
[ENHANCEMENT/BUGFIX] Few animation editor bugfixes and improvements
2024-09-16 18:48:50 -04:00
Eric 359e4b41e5
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:48:33 -04:00
Eric b0c9365c56
Merge pull request #2942 from FlooferLand/new-settings-items
New settings widgets (Number, Checkbox, Enum)
2024-09-16 18:42:48 -04:00
Eric 65fddd95bb
Merge branch 'develop' into new-settings-items 2024-09-16 18:42:43 -04:00
Eric f1d3ace247
Merge pull request #2925 from gamerbross/bugfix/character-danceevery
[BUGFIX] Implement `danceEvery` for Characters
2024-09-16 18:42:40 -04:00
Eric 9e90e67673
Merge branch 'develop' into bugfix/character-danceevery 2024-09-16 18:42:32 -04:00
Eric 3ce7cd6990
Merge pull request #2903 from AbnormalPoof/develop
[ENHANCEMENT] Enable auto-pause for Video Cutscenes
2024-09-16 18:42:20 -04:00
Eric d4cd2d031c
Merge branch 'develop' into develop 2024-09-16 18:41:33 -04:00
Eric 081d2d8fd8
Merge pull request #2992 from gamerbross/bugfix/charteditor-liveinput-number-6
[BUGFIX + REFACTOR] ChartEditor Live Input
2024-09-16 18:40:24 -04:00
Eric 99f4d13e47
Merge branch 'develop' into bugfix/charteditor-liveinput-number-6 2024-09-16 18:40:12 -04:00
Eric 8cad10263e
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:37:35 -04:00
Eric 8470880e4a
Merge pull request #2926 from gamerbross/tweak/funkinsound-playonce-return-value
[CODE TWEAK] `FunkinSound.playOnce` return the created sound
2024-09-16 18:36:53 -04:00
Eric 6bde7c34a0
Merge branch 'develop' into tweak/funkinsound-playonce-return-value 2024-09-16 18:36:45 -04:00
Eric 3ac10fb45c
Merge pull request #2981 from gamerbross/bugfix/forced-sustaintrail-alpha
[BUGFIX] SustainTrail forced alpha
2024-09-16 18:35:31 -04:00
Eric fb0b277a9c
Merge branch 'develop' into bugfix/forced-sustaintrail-alpha 2024-09-16 18:35:17 -04:00
Eric 519a6f3412
Merge pull request #2873 from JVNpixels/JVNPixels-story-menu-scrolling-fixed
[ENHANCEMENT]: Story Mode Menu Mouse Scrolling
2024-09-16 18:34:58 -04:00
Eric 27f700dd98
Merge branch 'develop' into JVNPixels-story-menu-scrolling-fixed 2024-09-16 18:34:43 -04:00
Eric f015976521
Merge pull request #2712 from gamerbross/bugfix/freeplay-difficulty-stack-overflow
[BUGFIX] Song with no "Normal" causes Stack Overflow
2024-09-16 18:34:06 -04:00
Eric 265039b025
Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:33:57 -04:00
Eric 8c6cb72d47
Merge pull request #2986 from AppleHair/bugfix/cancel-menu-sound
[BUGFIX] Fixed `cancelMenu` sound not playing after switching state
2024-09-16 18:30:02 -04:00
Eric b3221c0e3f
Merge branch 'develop' into bugfix/cancel-menu-sound 2024-09-16 18:29:51 -04:00
Eric c7cb03dd1d
Merge pull request #2990 from gamerbross/bugfix/f5-reload-chart
[BUGFIX] F5 now reloads the chart in the PlayState
2024-09-16 18:29:39 -04:00
Eric a7c0512503
Merge branch 'develop' into bugfix/f5-reload-chart 2024-09-16 18:29:33 -04:00