cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-19 16:41:39 +00:00
Code Issues Releases Wiki Activity
2856 commits 3 branches 3 tags 3 GiB
Commit graph

2043 commits

Author SHA1 Message Date
EliteMasterEric 77ff261be1 Make functions non-inline so they work on HScript 2024-02-16 13:08:34 -05:00
Mike Welsh e90c37ad75 Fix issue with incorrect music after pausing during countdown 
Whenever you pause gameplay, the `PlayState` pauses the music.
But if you start a song from the main menu, pause during the 3,2,1
countdown, and then unpause, the main menu music will incorrectly
start playing again due to `FlxG.sound.music` still referencing it
before the gameplay song starts playing.

Only restart the music if it was actually playing to begin with by
storing the play state in `PlayState.openSubState` when we pause.

This hopefully avoids any other cases where the pause state gets
pushed while the music is stopped.
 2024-02-16 04:54:27 -08:00
Cameron Taylor 94938313dd click preview to open screenshots folder (and moved openFolder to FileUtil 2024-02-16 05:24:43 -05:00
Cameron Taylor 0036a334bc display fancy preview as a sprite on top of FlxG.stage, to properly render over substates 2024-02-16 04:48:54 -05:00
Mike Welsh d6b3e2a9cf Fix FunkinSound not resuming after focus 
`FunkingSound.onFocus` was checking `_shouldPlay` before resuming,
but this would always be false, causing the sound to not resume
when tabbing out and back into the game.
 2024-02-16 00:08:33 -08:00
EliteMasterEric e24c78ae16 Implemented a screenshot button. FancyPreview is broken. 2024-02-15 21:34:24 -05:00
EliteMasterEric 5ec0939263 Bunch of changes to NoteScriptEvent and death logic 2024-02-15 17:25:28 -05:00
EliteMasterEric c896300b63 NoteData stringifies nicer now. 2024-02-15 17:23:43 -05:00
Eric 10f4ad704e Additional mathematical utilities. 2024-02-15 14:17:44 -05:00
Cameron Taylor 638c166663 optimization when opening from pause menu 2024-02-15 04:10:48 -05:00
Cameron Taylor 18a926e108 Merge branch 'rewrite/master' into input-offsets 2024-02-15 03:52:00 -05:00
Mike Welsh 91ab1cb520 Remove hmm dependency to fix HTML5 target 
Remove the `hmm` haxelib dependency from the build.

Linking to `hmm` caused `utest` to be transitively linked, which
eventually caused OpenFL to act strangely and instatiate the
application twice on the HTML5 target.

`hmm` was only used for `HaxelibVersions.getLibraryVersions` macro
call. Instead, manually parse the `hmm.json` ourselves to avoid
the dependency. This fixes the HTML5 target.

`hmm` is still used for package management, but no longer linked
in to the build itself.
 2024-02-15 00:23:24 -08:00
Cameron Taylor 96d27c271a avg offset better calc 2024-02-14 08:29:38 -05:00
EliteMasterEric 9209bac02c Port improved AtlasSprite from char-select-rebase 2024-02-14 03:27:34 -05:00
Cameron Taylor b96232787a hide storymode menu characters if they dont exist for the level 2024-02-13 05:23:59 -05:00
Cameron Taylor c3d03011cc Merge branch 'rewrite/master' into input-offsets 2024-02-13 03:34:41 -05:00
Cameron Taylor 923f8f423e swag truthers we are BACK 2024-02-13 03:32:20 -05:00
EliteMasterEric bd4103fd11 Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload 2024-02-13 03:06:20 -05:00
EliteMasterEric e37fc09e89 Hashlink actually working! 2024-02-13 03:03:11 -05:00
Cameron Taylor 6b80e292e5 Merge branch 'rewrite/master' into input-offsets 2024-02-13 03:02:33 -05:00
EliteMasterEric fa4b896d9a Merge branch 'rewrite/master' into feature/hashlink-hot-reload 2024-02-13 02:23:14 -05:00
EliteMasterEric c4522fe177 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-13 02:17:06 -05:00
EliteMasterEric f7da12acbc Apparently the transition bug was TransitionableSubState's fault so kill it with fire. 2024-02-13 02:09:25 -05:00
EliteMasterEric f0b5ef4491 Rest in peace, SwagCamera. 2024-02-13 01:38:11 -05:00
Cameron Taylor 681cfa0883 chart editor waveform fixes for single vocal audio files 2024-02-13 01:16:09 -05:00
Cameron Taylor 41e94f951e Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character 2024-02-13 00:48:26 -05:00
Cameron Taylor 8c54a62ed6 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-13 00:41:03 -05:00
Cameron Taylor 6e0f577d54 debugger fixes 2024-02-13 00:29:46 -05:00
EliteMasterEric 0ff258ce75 Use stickers to transition from the Results state 2024-02-12 23:34:51 -05:00
EliteMasterEric 1b5b7f0ae2 Fix a bug where stickers were broken on story mode 2024-02-12 23:34:40 -05:00
EliteMasterEric 0494ddb506 Fix crash in chart editor minimal Playtest 2024-02-12 23:19:25 -05:00
Cameron Taylor 92f52b2c3f flixel debugging on test builds 2024-02-12 23:15:18 -05:00
Cameron Taylor 58077b4505 more working audio offset in progress 2024-02-12 22:44:59 -05:00
Cameron Taylor e759f90147 audioVisualOffset numbers 2024-02-12 22:14:35 -05:00
Cameron Taylor 25766dbde9 decoupling some stuff from Conductor.instance 2024-02-12 21:41:16 -05:00
Cameron Taylor 43ec35f5fd derp .position -> .time fix 2024-02-12 21:00:40 -05:00
Cameron Taylor 6ac24141f4 Merge branch 'rewrite/master' into input-offsets 2024-02-12 20:57:42 -05:00
Cameron Taylor 0145d7ed2d input offset edits in progress 2024-02-12 20:06:43 -05:00
EliteMasterEric 86488a0964 Ensure the CrashHandler ALWAYS initializes first so we have stack traces. 2024-02-12 18:09:36 -05:00
EliteMasterEric 2d8e686b33 Attempt to fix StickerState bug 2024-02-12 16:50:40 -05:00
EliteMasterEric ef28d34520 Sort PlayState imports 2024-02-12 16:50:29 -05:00
EliteMasterEric 60cde55950 Add scripted FunkinSprite 2024-02-12 16:50:18 -05:00
EliteMasterEric f4d4d6a194 Fix deprecation issue with FlxTweenType. 2024-02-12 16:49:56 -05:00
EliteMasterEric f14193e17b Fix black screen on Grabbable Camera 2024-02-12 16:49:36 -05:00
EliteMasterEric ce0860fc18 Error handling for frame buffer 2024-02-12 16:49:25 -05:00
EliteMasterEric a0df87c6b2 Add state and substate to watch 2024-02-12 16:49:04 -05:00
Cameron Taylor d903edcb59 Merge branch 'rewrite/master' into input-offsets 2024-02-10 15:43:27 -05:00
Cameron Taylor aeddcee983 tweaks in progress 2024-02-10 15:42:29 -05:00
Cameron Taylor 902eb3af91 Merge pull request #288 from FunkinCrew/ansi-trace 
ansi
 2024-02-10 13:45:18 -05:00
EliteMasterEric d0b3842d44 Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:38:23 -05:00
Cameron Taylor 66188fbd52 Merge branch 'rewrite/master' into feature/chart-editor-freeplay-difficulty 2024-02-10 02:32:23 -05:00
EliteMasterEric eea8dde455 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:30:50 -05:00
Cameron Taylor 4bfab35b29 Merge branch 'rewrite/master' into feature/dialogue-data-refactor 2024-02-10 02:25:06 -05:00
EliteMasterEric bb0b176469 Fix bug with building specifically for freeplay. 2024-02-10 00:51:02 -05:00
EliteMasterEric 3ede16be16 Fix issue where Freeplay could be silent sometimes 2024-02-10 00:50:07 -05:00
EliteMasterEric 091f8eb724 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-09 23:13:40 -05:00
EliteMasterEric 4bf9f68658 Finalize freeplay preview toolbox 2024-02-09 14:58:57 -05:00
EliteMasterEric 4491465bf9 Implement difficulty rank into Metadata toolbox. 2024-02-08 19:22:28 -05:00
EliteMasterEric 2dd5f476b5 Fix a bug where alt instrumentals will load but not cache. 2024-02-08 02:21:12 -05:00
EliteMasterEric 31cd5b3414 Rework Conversation data parsing 2024-02-07 18:45:13 -05:00
EliteMasterEric fa556dc1f2 Rewrite conversation JSON parsing code. 2024-02-07 09:21:44 -05:00
EliteMasterEric 82b63c02e1 Reworks to make Pico mode actually work. 2024-02-05 21:35:58 -05:00
EliteMasterEric e5fb1de4ba Fix a boatload of deprecation warnings and upgrade a few libraries. 2024-02-05 19:46:11 -05:00
EliteMasterEric 167976c8ba Work in progress 2024-02-05 13:35:30 -05:00
Cameron Taylor 984c26c0e5 Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox 2024-02-05 13:06:25 -05:00
Cameron Taylor 201e109d64 Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes 2024-02-05 13:03:32 -05:00
Cameron Taylor cc8b2b2d20 Merge branch 'rewrite/master' into feature/units 2024-02-05 11:55:52 -05:00
EliteMasterEric 8be9c4f8ed Fix web builds. 2024-02-02 23:26:02 -05:00
Eric 4d6ee03947 Merge branch 'rewrite/master' into ansi-trace 2024-02-02 22:39:06 -05:00
EliteMasterEric 387ff4e816 Replace multiple conditions with array. 2024-02-02 22:38:34 -05:00
EliteMasterEric f6f9ad3985 Completed functionality for offset window. 2024-02-02 21:53:45 -05:00
Jenny Crowe fe7ffecc0d Chart editor: Tweaked FlxCamera management when entering and exiting playtest mode to fix UI-related crashes. 2024-02-01 13:52:50 -07:00
Cameron Taylor 3621f17bd0 maybe acurate? 2024-01-31 03:24:00 -05:00
Cameron Taylor 0f29f2f7a6 Merge branch 'rewrite/master' into input-offsets 2024-01-31 00:39:35 -05:00
EliteMasterEric f74604c48e Feature changes to Offsets window 2024-01-30 21:50:25 -05:00
EliteMasterEric 0f5be08c41 Add mute and max volume options to FunkinSound. 2024-01-30 21:49:49 -05:00
EliteMasterEric c23ddb5c5a Fixes to the MeshRenderer 2024-01-30 21:49:34 -05:00
Cameron Taylor c44e33c556 derp 2024-01-27 06:16:46 -05:00
EliteMasterEric f6e4bc863d Work in progress on offsets toolbox (working dragging!) 2024-01-27 03:24:49 -05:00
EliteMasterEric 8085b20a67 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offset-toolbox 2024-01-27 00:56:13 -05:00
Jenny Crowe 7137c13382 Copy command now pulses events in selection even if no notes are in the selection. "Copied" prompt now includes events in the text. 2024-01-26 19:36:10 -07:00
Jenny Crowe 4743076314 Added % as a unit to not include a space for when displaying in the event tooltip 2024-01-26 19:01:05 -07:00
Jenny Crowe bfb032dc7f Added units to other song events. 2024-01-26 18:51:36 -07:00
Jenny Crowe 4f7c2cd511 Now using hbox to more easily append unit label 2024-01-26 18:30:41 -07:00
Jenny Crowe 8b19a7511c Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units 2024-01-26 18:20:04 -07:00
Cameron Taylor ca739cee45 event.value -> event.value.toFloat() fix 2024-01-25 23:05:54 -05:00
Cameron Taylor 72fe05ddf5 Merge branch 'rewrite/master' into feature/audio-tab-upgrade 2024-01-25 22:52:31 -05:00
Cameron Taylor a0b855c8bb Merge pull request #300 from FunkinCrew/bugfix/vocal-offset-loading 
Fixed bugs related to instrumental/vocal offsets not loading or being taken into account properly
 2024-01-25 22:32:08 -05:00
EliteMasterEric c9163986d5 Initial attempt at rendering the waveform inside the offsets toolbox. 2024-01-25 20:23:18 -05:00
EliteMasterEric 25aff02784 Added options for waveform amplitude and minimum size. 2024-01-25 19:10:33 -05:00
Jenny Crowe e111e91a9c Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly. 2024-01-24 20:31:25 -07:00
EliteMasterEric abebfd8300 Added a forceUpdate option, and improved efficiency of other setters. 2024-01-24 15:47:43 -05:00
EliteMasterEric 17bf3289b5 Fix for default constructor values. 2024-01-24 14:54:29 -05:00
EliteMasterEric ba674b1f92 Added support for clipRects to WaveformSprite. 2024-01-24 14:35:50 -05:00
EliteMasterEric a1cff6be50 Replace waveform renderer with the newer, more performant version. 2024-01-23 23:24:05 -05:00
EliteMasterEric e8fa7f9c70 Performant audio waveforms generated directly from provided FlxSound elements. 2024-01-23 22:47:27 -05:00
Jenny Crowe dfe4ff614c Editor: Removed side sliders. Split vocal volume into two sliders. Removed vocal volume from the savefile. 2024-01-22 23:51:13 -07:00
EliteMasterEric c3d2582252 Work in progress on new Waveform renderer 2024-01-20 14:07:48 -05:00
EliteMasterEric 608d9b6968 Add new Offsets window, work in progress 2024-01-20 14:07:31 -05:00
Jenny Crowe a7e9f08e26 Editor now loads saved inst/vocal offset properly. 2024-01-19 21:24:18 -07:00
Jenny Crowe 9adfd0b6f1 Vocal offset is now properly taken into account when playing a song 2024-01-19 21:02:43 -07:00
EliteMasterEric d215152aaf Fix a bug where removing audio tracks wouldn't remove their visualizers. 2024-01-18 22:28:25 -05:00
Eric ae907beab9 Merge branch 'rewrite/master' into ansi-trace 2024-01-18 10:01:18 -05:00
Cameron Taylor 969626c8f8 Merge pull request #296 from FunkinCrew/bugfix/play-pause-button 
Stop audio playback when starting playtest, fixing the button icon.
 2024-01-18 07:18:10 -05:00
Cameron Taylor f13772da67 Merge branch 'rewrite/master' into bugfix/chart-editor-upload-vocals-rewrite 2024-01-18 07:13:57 -05:00
Cameron Taylor fa00140d23 stringify moved to SongEventSchema 2024-01-18 04:25:15 -05:00
Cameron Taylor 210088a25d Merge branch 'rewrite/master' into feature/chart-editor-event-tooltips 2024-01-18 04:25:04 -05:00
EliteMasterEric 3ef7a03094 Add "Remove Difficulty" button to the Difficulty toolbox. 2024-01-18 01:08:38 -05:00
Cameron Taylor 2fa5b1a9db Merge branch 'rewrite/master' into bugfix/pico-death-anim-fix 2024-01-18 00:57:25 -05:00
Cameron Taylor ab9b6d6c47 Merge pull request #292 from FunkinCrew/bugfix/chart-editor-selection-box 
Fix a bug where the drag-to-select box in the chart editor is not visible
 2024-01-18 00:40:05 -05:00
Cameron Taylor ef11f89632 Merge branch 'rewrite/master' into feature/separate-character-vocal-volumes 2024-01-18 00:24:47 -05:00
EliteMasterEric 8c770e6c62 Stop audio playback when starting playtest, fixing the button icon. 2024-01-18 00:00:57 -05:00
EliteMasterEric 25fe2c0d39 Rewrite Upload Vocals dialog. 2024-01-17 23:53:23 -05:00
EliteMasterEric 26b7610663 Fix an error with playable Pico death 2024-01-17 23:14:28 -05:00
EliteMasterEric a0c4499b03 Fix a bug where replaying a level makes a pink screen 2024-01-17 23:12:59 -05:00
EliteMasterEric 027c2843f4 This bug took me like 4-5 hours of staring at code to fix i am going crazy graaaa 2024-01-17 22:19:40 -05:00
Cameron Taylor 96d02261c5 Merge branch 'rewrite/master' into feature/stage-solids 2024-01-17 21:40:26 -05:00
Jenny Crowe e44b028946 Added side sliders that alter the volume of vocals and hitsounds on player/opponent sides. 2024-01-17 16:24:03 -07:00
EliteMasterEric 80c7bcdfdf Rewrite Stage data handling to use the Registry pattern, and add support for solid colors. 2024-01-16 17:08:25 -05:00
Cameron Taylor ba0660c2c0 ansi 2024-01-16 08:58:31 -05:00
Cameron Taylor 4375dfd13a Merge pull request #285 from FunkinCrew/feature/play-state-note-polish 
Feature/play state note polish
 2024-01-16 06:27:30 -05:00
Cameron Taylor 6564aba2c1 Merge pull request #286 from FunkinCrew/bugfix/story-menu-animations 
Reuse LevelProps (this fixes animations when switching weeks)
 2024-01-16 06:27:18 -05:00
Cameron Taylor f371559e81 Merge pull request #287 from FunkinCrew/bugfix/week-7-death 
Fix week 7 death animations.
 2024-01-16 06:26:21 -05:00
Cameron Taylor 1dcd0debc7 conductor stuff 2024-01-16 05:37:06 -05:00
EliteMasterEric 673f7f57d4 Fix pink rim on low zoom levels. 2024-01-16 00:03:30 -05:00
EliteMasterEric 5ac4b14891 Fix week 7 death animations. 2024-01-15 23:51:37 -05:00
EliteMasterEric b4edcc4b3c Reuse LevelProps (this fixes animations when switching weeks) 2024-01-15 23:43:05 -05:00
EliteMasterEric 3d2e50906f I was in fact a dumbass. 2024-01-15 22:13:01 -05:00
EliteMasterEric e391c02015 Polish note display visuals, and scrap Killer judgement. 2024-01-15 22:10:42 -05:00
EliteMasterEric e0dfdd40a2 Merge remote-tracking branch 'origin/rewrite/master' into feature/play-state-note-polish 2024-01-15 21:55:23 -05:00
Cameron Taylor 3b078ee42c Merge pull request #284 from FunkinCrew/bugfix/chart-editor-edit-context 
Fix "Edit Event" menu item when right clicking chart events
 2024-01-15 21:30:22 -05:00
EliteMasterEric 3366240eb5 Fix "Edit Event" menu item when right clicking chart events 2024-01-15 18:21:49 -05:00
EliteMasterEric 6f0f5ea610 Fix a crash when closing chart editor with no music playing 2024-01-15 15:33:28 -05:00
EliteMasterEric 313fd55e98 WIP 2024-01-15 14:20:44 -05:00
Cameron Taylor 0504918530 Merge branch 'rewrite/master' into freeplay-rand-fixy 2024-01-14 12:11:24 -05:00
EliteMasterEric d53dbd67e3 Rewrite to character animation, boyfriend death animation should be fixed 2024-01-14 09:18:32 -05:00
Cameron Taylor bf11071349 null check on daSong for difficultyStars 2024-01-14 08:48:50 -05:00
EliteMasterEric 549d461172 Fix an issue where Song offsets would be null rather than zero. 2024-01-14 06:46:58 -05:00
EliteMasterEric 3e8200ee9d Allow builds without hxCodec if using hashlink 2024-01-12 21:52:28 -05:00
Cameron Taylor 75dfed8229 -release fix 2024-01-12 19:50:13 -05:00
EliteMasterEric 9fe0c68256 Add theme music toggle and extend fade in 2024-01-12 18:29:02 -05:00
Cameron Taylor 99b7a8a75d Merge branch 'rewrite/master' into bugfix/chart-editor-positioning-fixes 2024-01-12 08:19:26 -05:00
Cameron Taylor e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
Cameron Taylor 7f83daf23b null fixy 2024-01-12 08:04:28 -05:00
Eric 2a7f9a0880 Merge branch 'rewrite/master' into bugfix/controller-overflow 2024-01-12 07:48:03 -05:00
EliteMasterEric 25c10d205d Some positioning fixes 2024-01-12 06:35:41 -05:00
Cameron Taylor fad569519d Merge branch 'rewrite/master' into bugfix/freeplay-icon-offsets 2024-01-12 06:15:15 -05:00
EliteMasterEric 025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
Cameron Taylor 2539b90ab8 Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak 2024-01-12 04:43:17 -05:00
EliteMasterEric c05131e6a9 Additional freeplay cleanup 2024-01-11 00:52:42 -05:00
EliteMasterEric 462eece09a Use proper difficulty rating data, proper clear percentage 2024-01-11 00:30:00 -05:00
EliteMasterEric fc12f956f6 Fix alignment of character pixel icons in freeplay menu 2024-01-10 20:58:29 -05:00
EliteMasterEric 06964ce1e3 Fix HTML5 build issue 2024-01-10 20:58:06 -05:00
EliteMasterEric 9947425a9e Merge remote-tracking branch 'origin/rewrite/master' into bugfix/controller-overflow 2024-01-10 00:23:36 -05:00
EliteMasterEric 043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -05:00
EliteMasterEric 59999aa8fd Fix an issue with release builds 2024-01-10 00:16:51 -05:00
Cameron Taylor b11bf09687 save/load for inputOffsets 2024-01-09 19:57:33 -05:00
Cameron Taylor 3544f2a804 input offset get/set functions in conductor 2024-01-09 19:48:01 -05:00
Cameron Taylor d9a6bead77 inputOffset + audioVisualOffset in Save class 2024-01-09 19:41:25 -05:00
EliteMasterEric 14df32d908 Implement haxelib versions into crash logs 2024-01-09 14:48:20 -05:00
Cameron Taylor 5d0c1521d5 strumline refactor stuffy 2024-01-09 13:16:00 -05:00
Cameron Taylor e323f46569 conductor.instance fixes 2024-01-08 15:46:16 -05:00
Cameron Taylor 7058d9baa7 stuf in progres 2024-01-08 15:39:44 -05:00
Cameron Taylor d62042a99a skip transition into debug substate 2024-01-08 15:39:44 -05:00
Cameron Taylor ac902c19c5 beats per measure conductor instance fix 2024-01-05 20:38:46 -05:00
Cameron Taylor ff88c53f7c steps per measure instance conductor fix 2024-01-05 20:38:20 -05:00
Cameron Taylor 350ce19783 conductor instnace small fix lol! 2024-01-05 20:37:13 -05:00
Cameron Taylor 8f7c449194 Merge branch 'rewrite/master' into feature/chart-editor-measure-numbers 2024-01-05 20:35:15 -05:00
Cameron Taylor cc7577a333 fix conductor instance stuf on watchPlugin 2024-01-05 20:25:54 -05:00
Cameron Taylor 97ea4b0891 re-add debug_refreshModules? 2024-01-05 20:23:15 -05:00
Cameron Taylor da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -05:00
Cameron Taylor 1e07b6ae22 Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay 2024-01-05 17:41:07 -05:00
Cameron Taylor ab316017f7 removed beatTime nullability? 2024-01-05 17:22:01 -05:00
Cameron Taylor 65aee1dd13 Merge branch 'rewrite/master' into bugfix/conductor-rewrite 2024-01-05 15:32:42 -05:00
EliteMasterEric a3123cd64c Measure numbers next to ticks and support for initial time signature. 2024-01-05 02:35:41 -05:00
EliteMasterEric 336810b628 Tooltips when hovering over chart events 2024-01-04 10:00:39 -05:00
EliteMasterEric 4a0a330eb4 Redo logic around note selection, add new buttons for selecting individual sides. 2024-01-04 08:20:34 -05:00
EliteMasterEric 4c353101ae Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-context-menus 2024-01-04 01:55:00 -05:00
EliteMasterEric edc6f85e21 Finish up event editing (selecting an existing event now shows its data in the event data toolbox) 2024-01-03 21:10:14 -05:00
Eric 7b219d1a38 Merge branch 'rewrite/master' into note-move-fix 2024-01-03 20:13:06 -05:00
EliteMasterEric 07bd2e44cd Fix a funny bug when restarting after game over 2024-01-03 20:12:46 -05:00
EliteMasterEric 7684757dbb Merge remote-tracking branch 'origin/rewrite/master' into no-debugger 2024-01-03 19:54:41 -05:00
EliteMasterEric bbaa9aa4af Work in progress on context menus and song event editing. 2024-01-03 19:53:17 -05:00
Cameron Taylor 97dea7403d Merge pull request #263 from FunkinCrew/bugfix/note-sustain-rendering 
Fix an issue where hold notes early in a song would not render properly.
 2024-01-03 10:39:59 -05:00
Cameron Taylor 7932094042 Merge branch 'rewrite/master' into note-move-fix 2024-01-03 10:36:11 -05:00
Cameron Taylor 200f5702ef disable note vwoosh, and fix gameover song not looping 2024-01-03 02:51:52 -05:00
EliteMasterEric a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
EliteMasterEric ddfecf2cfc Clean up difficulty label behavior 2024-01-02 14:07:07 -05:00
EliteMasterEric b1c9332830 Fix an issue where hold notes early in a song would not render properly. 2024-01-02 01:33:10 -05:00
Cameron Taylor 92e0022fed derp comma! 2024-01-01 19:13:51 -05:00
Cameron Taylor 11d21c1369 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2024-01-01 19:09:36 -05:00
Cameron Taylor e6cee0079f Merge pull request #260 from FunkinCrew/bugfix/pink-game-over-screen 
Fix a bug where the background of the game over screen is pink
 2023-12-22 22:52:49 -05:00
Eric edd8bdc014 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2023-12-19 19:04:40 -05:00
EliteMasterEric 711253a202 Update HaxeUI to latest 2023-12-19 16:12:25 -05:00
EliteMasterEric 8fea7eb734 Fix a bug where the background of the game over screen is pink 2023-12-19 01:57:39 -05:00
EliteMasterEric 70b7de94aa Fix to Metadata toolbox causing crash when no GF :( 2023-12-19 01:28:13 -05:00
EliteMasterEric ad02bf2ee0 Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor 2023-12-19 01:27:58 -05:00
EliteMasterEric bb0fb02813 Fix to launching directly into Chart Editor 2023-12-19 01:26:43 -05:00
EliteMasterEric 3e65e7ecc5 Fix for vocals not loading properly and not getting cleared properly. 2023-12-19 01:26:26 -05:00
EliteMasterEric 328bb7b938 Fixes to Erect/Nightmare only 2023-12-19 01:25:15 -05:00
EliteMasterEric 4ff5bd21df Fixes to the FNF Legacy JSON parser 2023-12-19 01:23:42 -05:00
Cameron Taylor 41ad47db52 Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-19 01:18:49 -05:00
Cameron Taylor 48f916240f playstate import fixes and asset update 2023-12-18 21:33:29 -05:00
Cameron Taylor 360ba69496 shaderslmfao fix 2023-12-18 20:49:01 -05:00
shr 7fcf4c4175 added custom blend feature 2023-12-18 20:15:40 -05:00
shr 90036ee75d removing da dumb needless functions 2023-12-18 20:15:40 -05:00
shr dc8dfeb336 add lightmaps 2023-12-18 20:15:40 -05:00
shr bc20b81723 squiiish 2023-12-18 20:15:40 -05:00
shr f7a519b13f cleaning code 2023-12-18 20:15:40 -05:00
shr ab7ba485cb added GrabbableCamera 2023-12-18 20:15:40 -05:00
shr 9fc3a46b48 shader update 2023-12-18 20:15:40 -05:00
shr 7c46bcb707 add docs 2023-12-18 20:15:40 -05:00
shr ace89a44a5 cleaning up code 2023-12-18 20:15:40 -05:00
shr 26818e6d99 made it a library 2023-12-18 20:15:40 -05:00
shr 6d0a8cc535 testing poyopoyo 2023-12-18 20:15:40 -05:00
shr 883ef13e65 finally did it 2023-12-18 20:15:40 -05:00
shr 56cecf98a0 fix typo 2023-12-18 20:15:40 -05:00
shr b88fbeb206 update draw() 2023-12-18 20:15:40 -05:00
shr 95b03debb3 still buggy 2023-12-18 20:15:40 -05:00
shr eb27c679c3 update shader 2023-12-18 20:15:40 -05:00
Cameron Taylor 32ec724da6 rainshader prototype 2023-12-18 20:15:40 -05:00
Cameron Taylor cf9915ef60 puddle positioning 2023-12-18 20:15:40 -05:00
Cameron Taylor 4815bed2cb abot in progresss 2023-12-18 20:15:40 -05:00
Cameron Taylor 4fc56a2280 small fix to backups folder not existing 2023-12-15 21:46:09 -05:00
EliteMasterEric 88ca58f9e2 Fixes for updated HaxeUI and Flixel. 2023-12-15 21:09:01 -05:00
Cameron Taylor e9ed7223b6 no debugger 2023-12-15 02:29:32 -05:00
Cameron Taylor 15f72adeed Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-14 18:41:23 -05:00
EliteMasterEric 3f2d1b4c1b Update haxelibs, add flixel-text-input to fix overlapping text 2023-12-14 17:34:02 -05:00
EliteMasterEric ca489b5609 Rewrite the Conductor to be a singleton instance. 2023-12-14 16:56:20 -05:00
EliteMasterEric b3236e6134 Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay. 2023-12-14 00:47:04 -05:00
Cameron Taylor 4ea04a9a2e Merge branch 'icon-charswitcher' into rewrite/master 2023-12-13 23:11:51 -05:00
EliteMasterEric e2b0ed98dd Fix a bug where making one selection and then making a different one would leave the original highlighted 2023-12-13 23:11:19 -05:00
Cameron Taylor 0a47689eaa ease 2023-12-13 23:11:12 -05:00
EliteMasterEric aeb2cf24ad Fix a rebase issue 2023-12-13 22:42:09 -05:00
EliteMasterEric b740fbf028 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform 2023-12-13 22:36:08 -05:00
Cameron Taylor 4193cd4ee2 proper dialog fading 2023-12-13 18:24:55 -05:00
Cameron Taylor 028e90474c Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 17:26:46 -05:00
Cameron Taylor db76a0dd1d Merge pull request #244 from FunkinCrew/chart-edit-playtest 
Enabling / Disabling "playtest" mode from chart editor
 2023-12-13 17:19:02 -05:00
Cameron Taylor b09ed369e8 f 2023-12-13 09:20:15 -05:00
Cameron Taylor 6ca0e32391 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 09:20:11 -05:00
Eric 34673c3f6c Merge branch 'rewrite/master' into mac-delete 2023-12-12 19:44:04 -05:00
EliteMasterEric 42d070922b Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform 2023-12-12 19:34:58 -05:00
Eric f36cb84797 Merge pull request #242 from FunkinCrew/copy-flash 
chart editor: copy notes polish
 2023-12-12 19:29:17 -05:00
Eric a6e7fc6d2c Merge pull request #241 from FunkinCrew/copy-preview 
note highlight preview
 2023-12-12 19:29:06 -05:00
Eric 50d015c449 Merge branch 'rewrite/master' into chart-edit-playtest 2023-12-12 17:09:26 -05:00
EliteMasterEric 43038d0a06 Move the "Start at current time" checkbox 2023-12-12 17:07:28 -05:00
Eric 591de9bf6d Merge branch 'rewrite/master' into icon-charswitcher 2023-12-12 14:29:06 -05:00
EliteMasterEric 52f16ce457 Redo icon dialog and add support to metadata dialog. 2023-12-12 05:24:43 -05:00
Cameron Taylor b33f27f097 tiny lil polish and cleanin 2023-12-11 04:35:39 -05:00
Cameron Taylor 05f977f85f character selector 2023-12-11 03:38:44 -05:00