EliteMasterEric
e23c1464f6
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1
2023-12-07 16:32:12 -05:00
EliteMasterEric
66611c5d2f
Fixes to FlxSound when pausing before starting
2023-12-06 22:03:36 -05:00
EliteMasterEric
1abd587645
Rework offsets to be built into the FlxSound
2023-12-06 15:04:24 -05:00
EliteMasterEric
1716ffc57f
Implement instrumental and vocal offsets into the PlayState.
2023-12-05 02:44:57 -05:00
EliteMasterEric
eebb2e874f
Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg
2023-11-29 16:42:40 -05:00
EliteMasterEric
ed10d2c5d0
Multiple chart editor bug fixes +tweaks
2023-11-28 20:36:59 -05:00
EliteMasterEric
47f39b072a
Convert chart editor to macro-based UIState
2023-11-24 00:42:07 -05:00
Eric
4406677be7
Fix character camera offsets embedded in stage data ( #218 )
...
* Make StageDataCharacter attributes mandatory, and remove defaults.
* Update character files
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-11-20 10:46:09 -05:00
Eric
260f1bd265
[BUGFIX] Fix an issue where PlayState would crash after the second song. ( #216 )
...
* Ignore blank lines in intro text
* Add a check when trying to render destroyed graphics.
* Persist noteSplash graphic so it isn't destroyed.
2023-11-20 10:42:23 -05:00
Cameron Taylor
0e21220e24
Merge pull request #215 from FunkinCrew/feature/rebind-debug-keys
...
Debug Controls, plus a chart loading fix
2023-11-16 02:20:53 -05:00
EliteMasterEric
2140158786
Debug controls, plus a chart loading fix
2023-11-16 00:02:42 -05:00
EliteMasterEric
b8504c8e3a
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/senpai-naughty
2023-11-15 00:47:47 -05:00
Cameron Taylor
12d5cf796b
Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update
2023-11-14 16:10:35 -05:00
Cameron Taylor
dbeb2a1a1e
Merge branch 'rewrite/master' into bugfix/cleanup
2023-11-14 15:31:54 -05:00
EliteMasterEric
ca3e00c1cd
Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update
2023-11-10 16:37:55 -05:00
EliteMasterEric
a9dfd4adcf
Fix a bug where multiple vocal tracks would play at once
2023-11-09 17:00:46 -05:00
EliteMasterEric
ce97a002cb
Reorganize a whole bunch of classes and perform syntax cleanup.
2023-11-07 04:04:22 -05:00
EliteMasterEric
21ba81c799
Fix a bug where returning to a week in Story Mode would not play dialog
2023-11-06 17:51:56 -05:00
EliteMasterEric
4833c9bd2e
Fix a bug where F5 would crash in Week 6.
2023-11-06 17:51:27 -05:00
EliteMasterEric
de5edb3cc2
Fix variation metadata and error message in
...
ChartEditorImportExportHandler
2023-11-05 00:08:18 -04:00
EliteMasterEric
efd29dafbf
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update
2023-11-04 23:51:15 -04:00
EliteMasterEric
eec3ac3ced
Clean up several messy chunks of code, and add support for dragging notes and events.
2023-10-26 05:46:22 -04:00
EliteMasterEric
e14e6448ac
More event type refactors
2023-10-25 01:13:06 -04:00
EliteMasterEric
acce2ac811
Move ScriptEventType to its own module.
2023-10-25 01:12:46 -04:00
EliteMasterEric
ffd0a98393
FNFC file rework (includes command line quicklaunch)
2023-10-21 01:04:50 -04:00
Cameron Taylor
902ad4be3a
Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-more-fixes
2023-10-18 19:47:50 -04:00
EliteMasterEric
cdab8753ea
Lots of reported bugs fixed.
2023-10-18 01:02:10 -04:00
EliteMasterEric
6bf6b8ef11
Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes
2023-10-18 00:04:04 -04:00
Cameron Taylor
d4e6befc28
submodule merge fix
2023-10-17 21:40:20 -04:00
Cameron Taylor
08845915ea
fixed cutscene skipping too fast from disabling inputs
2023-10-17 21:26:32 -04:00
EliteMasterEric
d47c5f5765
Merge branch 'rewrite/bugfix/chart-editor-various-fixes' into rewrite/master
2023-10-17 21:21:46 -04:00
Cameron Taylor
4b255174fb
Merge pull request #196 from FunkinCrew/rewrite/bugfix/chart-editor-bpm-fixes
...
Chart Editor: Fix issues with changing BPMs of songs.
2023-10-17 19:11:57 -04:00
Cameron Taylor
7cfbd0ca0f
Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes
2023-10-17 19:02:36 -04:00
EliteMasterEric
6cb8a719af
Additional cleanup on difficulty sort order (tested and working!)
2023-10-17 17:27:11 -04:00
Cameron Taylor
a129e6219d
Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/master
2023-10-17 17:20:08 -04:00
EliteMasterEric
6888e7b122
Merge branch 'rewrite/bugfix/pause-and-results-fixes' of https://github.com/FunkinCrew/Funkin-secret into rewrite/bugfix/pause-and-results-fixes
2023-10-17 17:10:16 -04:00
EliteMasterEric
a4fde254d9
Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes
2023-10-17 17:07:36 -04:00
EliteMasterEric
4e0934dbd1
Fix issues with changing BPMs of songs.
2023-10-17 16:57:06 -04:00
EliteMasterEric
f51592963e
Fixes for a few bugs in the chart editor.
2023-10-17 02:42:52 -04:00
Cameron Taylor
afcb677fac
index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872
song diff menu sort
2023-10-17 00:38:28 -04:00
Cameron Taylor
9b8fc87261
song diff menu sort
2023-10-17 00:07:36 -04:00
Cameron Taylor
732fe59c3e
Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad
2023-10-16 16:47:51 -04:00
Cameron Taylor
865f771c4a
Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/preferences-rewrite
2023-10-15 20:54:22 -04:00
EliteMasterEric
7a9b4d6bf0
Add the "death.cameraOffset" attribute to character data
2023-10-15 00:51:20 -04:00
EliteMasterEric
8589c10c75
Fixes to Pause screen and Results screen
2023-10-11 17:33:55 -04:00
EliteMasterEric
989d1c3175
Merge rewrite/master, fix high score retrieval
2023-10-10 23:32:01 -04:00
Cameron Taylor
e5fbf5d99f
Merge pull request #180 from FunkinCrew/rewrite/bugfix/difficulty-switch-crash
...
[CRASH FIX] Safely handle difficulty switching to avoid null object reference in Play State
2023-10-10 21:33:57 -04:00
EliteMasterEric
5ae2bc814b
Fix issue causing crash on F5
2023-10-09 15:35:50 -04:00
EliteMasterEric
e967b1e7f3
Fix vocals not changing when switching difficulties.
2023-10-09 14:19:52 -04:00
EliteMasterEric
74b925d2c6
Assert the difficulty exists (and throw an error if it doesn't) before performing reset.
2023-10-09 14:13:14 -04:00
Cameron Taylor
5617f8f63e
Merge pull request #165 from FunkinCrew/rewrite/feature/chart-editor-variation-button
...
Chart Editor: Add Variation Button
2023-10-09 05:20:11 -04:00
EliteMasterEric
4a4708fe23
That is the fastest I have ever fixed a bug holy shit.
2023-10-06 11:42:39 -04:00
EliteMasterEric
5931345c71
Rewrite precise inputs to work on gamepad
2023-10-05 02:21:01 -04:00
EliteMasterEric
380d30d63f
Rewrote code for preferences to use Save data.
2023-10-04 11:40:55 -04:00
EliteMasterEric
490b2f18d0
Rewrite save data functionality (now with type safety and migration)
2023-10-03 19:14:46 -04:00
EliteMasterEric
be4fd74d40
Resolve metadata loading issues.
2023-09-25 23:24:18 -04:00
EliteMasterEric
42bb50882d
"Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues.
2023-09-25 23:24:07 -04:00
EliteMasterEric
dc728133d1
Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp
2023-09-20 19:41:17 -04:00
EliteMasterEric
86c105aff8
Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework
2023-09-18 21:58:22 -04:00
EliteMasterEric
06269e95fd
Fix to crash in freeplay (swapped two args oops!)
2023-09-18 20:02:17 -04:00
EliteMasterEric
09b03efeea
Merge branch 'master' into bugfix/chart-editor-null-safety
2023-09-18 16:52:47 -04:00
EliteMasterEric
8dd07d2763
I discovered a new profiling tool and stayed up until 5 AM optimizing shit.
2023-09-13 14:51:12 -04:00
EliteMasterEric
a02058b260
Merge branch 'feature/improved-cursor' into develop
2023-09-12 19:52:08 -04:00
EliteMasterEric
fa28932dea
Implementing custom cursor modes for better interface readability.
2023-09-12 19:42:39 -04:00
EliteMasterEric
ef1cb10bb3
Merge remote-tracking branch 'origin/bugfix-squash/song-data-parser-rework' into HEAD
2023-09-08 18:23:55 -04:00
EliteMasterEric
f4bc682ea1
Remove funkin.play.song.SongData and refactor app to match.
2023-09-08 17:46:44 -04:00
EliteMasterEric
c78c6439a6
Filled out null safety checks.
2023-08-31 18:47:23 -04:00
Eric
cb81371b4a
Fix an occasional bug where "default" will be used over "" causing a crash on song load. ( #135 )
2023-08-28 15:07:51 -04:00
Eric
21f44edf1d
New crash handler + Additional null safety for ChartEditorState ( #130 )
...
* A bunch of smaller syntax tweaks.
* New crash handler catches and logs critical errors!
* Chart editor now has null safety enabled.
* Fix -W build issue.
* Actually update hmm.json to use the crash handling branch
* Fix issues causing crash handler to trigger
2023-08-28 15:03:29 -04:00
Eric
74dac9d830
Fix a story mode bug where charts would sometimes not be loaded for the second and third song. ( #134 )
2023-08-22 23:18:37 -04:00
Eric
235969e9a7
Fixed an issue where the Week 6 countdown was anti-aliased. ( #133 )
2023-08-22 22:45:58 -04:00
Eric
42d8d55067
Unit Test Suite ( #119 )
...
* Initial test suite
* Fix some build warnings
* Implemented working unit tests with coverage
* Reduced some warnings
* Fix a mac-specific issue
* Add 2 additional unit test classes.
* Multiple new unit tests
* Some fixins
* Remove auto-generated file
* WIP on hiding ignored tests
* Added list of debug hotkeys
* Remove old website
* Remove empty file
* Add more unit tests
* Fix bug where arrows would nudge BF
* Fix bug where ctrl/alt would flash capsules
* Fixed bug where bf-old easter egg broke
* Remove duplicate lines
* More test-related stuff
* Some code cleanup
* Add mocking and a test assets folder
* More TESTS!
* Update Hmm...
* Update artist on Monster
* More minor fixes to individual functions
* 1.38% unit test coverage!
* Even more tests? :O
* More unit test work
* Rework migration for BaseRegistry
* gameover fix
* Fix an issue with Lime
* Fix issues with version parsing on data files
* 100 total unit tests!
* Added even MORE unit tests!
* Additional test tweaks :3
* Fixed tests on windows by updating libraries.
* Set versions for flixel-ui and hamcrest
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2023-08-22 04:27:30 -04:00
EliteMasterEric
c6a1f5ffea
Work on fixing issues with difficulty/variation handling in charts
2023-08-11 14:00:38 -04:00
EliteMasterEric
68c85d9214
Made the currently-unused Divisions field optional.
2023-08-10 15:34:40 -04:00
EliteMasterEric
34abee594d
Fix bug where onUpdate was called twice per frame
2023-08-09 18:11:19 -04:00
EliteMasterEric
859b543118
Merge branch 'bugfix/play-state-fix' into feature/chart-editor-song-preview
2023-08-09 17:53:25 -04:00
EliteMasterEric
3e02f7fca9
Fix a bug where beatState
sometimes gets called before create
2023-08-09 00:28:09 -04:00
EliteMasterEric
b9c25d6ed9
Fix crashing, broken countdown, broken miss muting in song preview
2023-08-04 17:25:13 -04:00
EliteMasterEric
a0a8d47216
Imported music now plays properly in chart editor state
2023-08-04 16:15:07 -04:00
EliteMasterEric
3e093510af
Fixed a bug where beat hit events were called multiple times during the conductor
2023-08-04 12:35:01 -04:00
EliteMasterEric
4852515c42
Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash.
2023-08-04 11:18:00 -04:00
EliteMasterEric
13671cf290
Make sure timestamps are consistent with use of Int64.
2023-08-04 11:13:41 -04:00
EliteMasterEric
49622f2441
Fix build issues caused by int64 handling
2023-08-03 22:22:29 -04:00
EliteMasterEric
29466af4b7
Fix issue where strumline would stay pressed when resetting.
2023-08-03 12:19:36 -04:00
EliteMasterEric
050086fb36
Fixed camera focus on game over.
2023-08-03 11:40:19 -04:00
Cameron Taylor
5bbf279208
gameover fix
2023-08-03 11:22:52 -04:00
EliteMasterEric
3a31c9731c
Fixed several bugs with Play State (mostly restarting the song)
2023-08-02 18:08:49 -04:00
EliteMasterEric
b54c335886
Fix for Menu->Freeplay and Play->Pause transitions
2023-08-02 11:00:23 -04:00
EliteMasterEric
005ffafe23
Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview
2023-08-01 16:03:34 -04:00
EliteMasterEric
979a5ad493
Merge branch 'master' into feature/chart-editor-bpm
2023-08-01 14:08:41 -04:00
EliteMasterEric
c0745d4ad7
Hide warning
2023-07-31 14:08:48 -04:00
EliteMasterEric
4e67791249
Vwoosh notes on reset
2023-07-31 13:42:13 -04:00
EliteMasterEric
92a0c367b7
Typo fixes
2023-07-31 13:31:17 -04:00
EliteMasterEric
d0ef34ced6
Merge branch 'master' into feature/new-input-system-yay
2023-07-26 22:00:14 -04:00
EliteMasterEric
b974e6d6d7
Fix issues with playtest and backwards time travel
2023-07-26 21:34:38 -04:00
EliteMasterEric
03444161e8
Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview
2023-07-26 20:03:37 -04:00
EliteMasterEric
2048e65bf2
Added ability to start song at a specific timestamp
2023-07-26 20:03:31 -04:00
EliteMasterEric
5ff546bacc
First iteration of song playtesting from editor!
2023-07-26 16:52:58 -04:00
EliteMasterEric
6af5259a10
Fix an issue where sustain sprites were not killed when the song was reset.
2023-07-25 21:39:19 -04:00
Cameron Taylor
211ccc2e47
Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks
...
Tweaks and improvements to the animation editor
2023-07-24 16:26:04 -04:00
EliteMasterEric
3c218ec01c
Done with BPM change fixes, currently working on rendering efficiency
2023-07-22 20:16:43 -04:00
Cameron Taylor
f634a099c3
actual songdata git merge proper lol
2023-07-22 14:43:28 -04:00
Cameron Taylor
85af96d654
Merge branch 'master' into feature/chart-editor-importer
2023-07-22 14:43:05 -04:00
EliteMasterEric
aaad06c97d
Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm
2023-07-19 21:19:21 -04:00
EliteMasterEric
ae76b24a65
New time calculation functions
2023-07-19 01:30:23 -04:00
EliteMasterEric
adda3020a9
Alphabetical sort
2023-07-19 01:29:43 -04:00
EliteMasterEric
16bcf2c767
Rework note sprites to pull note style data
2023-07-13 20:27:45 -04:00
EliteMasterEric
ba53957191
Fixed an issue where dialogue scripts were not being reloaded
2023-07-13 20:26:56 -04:00
EliteMasterEric
00cfeeff72
Created the Note Style class and data registry
2023-07-13 20:25:44 -04:00
EliteMasterEric
883ab87931
Moved AnimationData into the data package
2023-07-13 20:25:01 -04:00
EliteMasterEric
70584c6e88
Make funkin.util.Constants auto-imported
2023-07-13 01:13:26 -04:00
EliteMasterEric
24c9786166
Merge branch 'master' into feature/new-input-system-yay
2023-07-10 18:16:16 -04:00
EliteMasterEric
17a8610640
Added colors to hold note covers
2023-07-10 18:14:34 -04:00
EliteMasterEric
796a51325f
Hold note covers are in and properly positioned
2023-07-08 01:03:46 -04:00
EliteMasterEric
54a9b09155
Merge branch 'master' into bugfix/conductor-monster
2023-07-06 12:35:49 -04:00
EliteMasterEric
a3929db7a8
Merge branch 'master' into feature/offset-editor-tweaks
2023-07-06 01:00:32 -04:00
EliteMasterEric
8e071221ff
Work in progress on hold covers
2023-07-05 22:11:58 -04:00
EliteMasterEric
b615fbf82a
WIP on hold covers
2023-07-04 16:38:10 -04:00
EliteMasterEric
f932422d74
Merge branch 'master' into feature/week-6-dialogue
2023-07-03 13:18:53 -04:00
EliteMasterEric
b764656a4e
Merge branch 'master' into feature/chart-editor-importer
2023-07-03 13:09:40 -04:00
EliteMasterEric
90bd5af376
Merge branch 'master' into feature/offset-editor-tweaks
2023-07-03 12:22:33 -04:00
EliteMasterEric
bb8b0b59b1
Video cutscenes in Week 7 no longer broken
2023-07-02 16:46:40 -04:00
EliteMasterEric
49ce962e34
Make metadata file loading actually work
2023-07-02 16:17:25 -04:00
EliteMasterEric
cddc50bbe5
Rework quickWatch
2023-07-02 16:17:04 -04:00
EliteMasterEric
8685054696
Freaky Menu uses metadata.json for BPM data.
2023-07-02 15:34:34 -04:00
EliteMasterEric
66f56dbf2c
system->sound
2023-07-02 15:34:07 -04:00
EliteMasterEric
085d7aaa9d
Fix for note splashes
2023-06-27 21:29:50 -04:00
EliteMasterEric
d91c341bd2
Fixed a bug where you could hold notes forever
2023-06-27 18:06:33 -04:00
EliteMasterEric
2f7708c106
Hold notes pretty much done! yay!
2023-06-27 17:22:51 -04:00
Cameron Taylor
740c547293
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/week-7-cutscenes
2023-06-27 17:07:35 -04:00
EliteMasterEric
a672db7b0e
Messing around with logic for hold note misses/health gain
2023-06-27 13:43:42 -04:00
EliteMasterEric
47d8d9e4db
Work in progress on redoing hold note rendering
2023-06-26 20:40:26 -04:00
EliteMasterEric
0fac918428
Reworked anti-aliasing code (sprites now default to true)
2023-06-25 12:36:00 -04:00
EliteMasterEric
2cae781984
Sustains are kinda working?
2023-06-22 19:28:39 -04:00
EliteMasterEric
25c70564bd
WIP on new note rendering, inputs.
2023-06-22 01:41:01 -04:00
EliteMasterEric
28ddadffff
Week 6 dialogue support + bug fixes
2023-06-16 17:37:56 -04:00
Cameron Taylor
092dcb5a35
counter fix thing
2023-06-15 14:31:49 -04:00
EliteMasterEric
9a541c5769
Merge branch 'death-alt' of https://github.com/FunkinCrew/Funkin-secret into death-alt
2023-06-15 03:49:24 -04:00
EliteMasterEric
02632a623c
Disable fakeout happening 100% of the time.
2023-06-15 03:48:52 -04:00
Cameron Taylor
aabf36a788
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into death-alt
2023-06-15 03:27:03 -04:00
EliteMasterEric
594cec62ad
Results screen now moves to Story menu if we are in story mode
2023-06-15 00:30:20 -04:00
EliteMasterEric
3d8dd8d604
More conductor rework changes
2023-06-15 00:29:40 -04:00
EliteMasterEric
3c558ce192
Pixel fixes
2023-06-15 00:29:18 -04:00
EliteMasterEric
506e4bf680
Propagate Conductor rework to dependent classes.
2023-06-15 00:15:57 -04:00
EliteMasterEric
b783271451
ComboCounter->ComboMilestone
2023-06-15 00:11:20 -04:00
EliteMasterEric
338342ad5e
Tweaks and improvements to the animation editor
2023-06-13 17:13:14 -04:00
Cameron Taylor
b564ad087b
vocals fix... lol!
2023-06-13 01:04:29 -04:00
EliteMasterEric
b847212375
Migrator fixes
2023-06-10 03:59:25 -04:00
EliteMasterEric
ba20e5c39c
Merge remote-tracking branch 'origin/recapitalizing' into bugfix/character-data
2023-06-09 15:46:40 -04:00
Cameron Taylor
a7eb91ce29
the SubState...
2023-06-09 15:44:29 -04:00
EliteMasterEric
2d04b1c5f1
Merge branch 'master' into bugfix/character-data
2023-06-09 15:34:56 -04:00
EliteMasterEric
038d258233
Chart editor changes (support for legacy import)
2023-06-09 15:28:14 -04:00
EliteMasterEric
2200b6a24a
File renames
2023-06-09 15:27:23 -04:00
Cameron Taylor
27a9ef211e
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/formatting-cleanup
2023-06-09 14:12:37 -04:00
EliteMasterEric
6f802f7658
Merge branch 'bugfix/formatting-cleanup' into feature/chart-editor-importer
2023-06-08 17:13:56 -04:00
EliteMasterEric
26998c9164
More chart editor changes
2023-06-08 17:07:35 -04:00
EliteMasterEric
3005aa1f3b
Added legacy importer
2023-06-08 16:48:34 -04:00
EliteMasterEric
e68f9ca9a1
Validated formatting of 203 HX files.
2023-06-08 16:30:45 -04:00
EliteMasterEric
a2b08e3e34
Update hxCodec
2023-06-06 17:38:40 -04:00
EliteMasterEric
1d3c4d61a6
Syntax fixes to get the branch to build
2023-06-06 17:38:31 -04:00
Cameron Taylor
7a04a2d774
blueball check
2023-06-04 01:19:08 -04:00
Cameron Taylor
2d772a526b
no skipping easter egg!!
2023-06-02 15:56:40 -04:00
EliteMasterEric
9f8d1dbac2
Playstate fixes WIP (TODO: fix compile errors)
2023-06-02 15:35:01 -04:00
EliteMasterEric
4851ff5c27
Internal rework to song events
2023-06-02 14:35:28 -04:00
EliteMasterEric
57caeef802
Work on re-enabling cutscenes
2023-06-02 14:35:08 -04:00
EliteMasterEric
4d539fdda2
Substate -> SubState (capitalization fix)
2023-06-01 18:52:58 -04:00
EliteMasterEric
09318c258b
Remove old story menu state
2023-06-01 15:59:56 -04:00
Eric
b49a2857e5
Revert guaranteed fakeout
2023-06-01 00:33:30 -04:00
EliteMasterEric
374f03dae3
Fakeout death now uses HScript
2023-06-01 00:31:32 -04:00
Cameron Taylor
2d16aab488
snds effects
2023-05-31 03:28:53 -04:00
Cameron Taylor
dbab5a912d
death alt easter egg
2023-05-31 03:03:10 -04:00
EliteMasterEric
a2ddeec5bb
Daddy Dearest animation fixes
2023-05-30 16:20:57 -04:00
EliteMasterEric
4efafe8a78
Health icon refactors/fixes
2023-05-26 17:10:35 -04:00
EliteMasterEric
872f7c93e8
Added onAdd event so GF character can fix position in Tutorial
2023-05-26 17:10:08 -04:00
EliteMasterEric
dc932eb8d7
A few bug fixes related to vocal tracks
2023-05-25 19:36:32 -04:00
EliteMasterEric
2af4a51b15
Merge branch 'master' into feature/split-vocals
2023-05-25 18:39:41 -04:00
EliteMasterEric
2f10de3594
New refactor to VoicesGroup to make multiple vocal tracks actually work
2023-05-25 18:34:26 -04:00
EliteMasterEric
317c127730
Deprecation warning fixes (no actual logic changes tho)
2023-05-25 18:33:39 -04:00
EliteMasterEric
09654170ed
Erect mixes play properly when selected
2023-05-22 13:47:01 -04:00
EliteMasterEric
a599dbea11
Reworked Story Menu (data driven)
2023-05-17 16:42:58 -04:00
EliteMasterEric
021f7a0a1c
Work in progress on story menu data storage rework
2023-05-16 22:09:53 -04:00
Cameron Taylor
03cab4a326
Merge pull request #81 from FunkinCrew/results-anims
...
different result screen in progress
2023-04-24 17:59:20 -04:00
Cameron Taylor
e802aa885b
gf shit fix
2023-04-21 17:39:27 -04:00
Cameron Taylor
03f48289e1
Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent
...
Fixed an issue where SongEventScriptEvent would not be dispatched
2023-04-20 16:56:05 -04:00
EliteMasterEric
337802a6bf
Fixed an issue where SongEventScriptEvent would not be dispatched
2023-04-20 13:48:15 -04:00
Cameron Taylor
6fe747eac1
true perfect
2023-04-19 04:08:03 -04:00
Cameron Taylor
b4468a45c3
no more shit loops!
2023-04-19 03:00:52 -04:00
Cameron Taylor
2fefb657ec
excellent looping issue
2023-04-19 02:51:47 -04:00
Cameron Taylor
7c225bea18
no forced shit mode
2023-04-17 17:59:47 -04:00
Cameron Taylor
e872dddd15
looping fix
2023-04-17 17:59:22 -04:00
Cameron Taylor
b1dfbb2ef2
shit one
2023-04-17 11:02:45 -04:00
Cameron Taylor
c2e340ef19
variation and hmm fix
2023-04-16 18:57:18 -04:00
Cameron Taylor
f411cdac88
different result screen in progress
2023-04-16 15:33:20 -04:00
Cameron Taylor
1a5b68acd8
substate loading type beat
2023-04-05 00:56:02 -04:00
Ravy
c68ed233f9
make game use rfc format for spitting inputs
2023-03-18 19:47:23 +00:00
Cameron Taylor
f32330914e
score fix for ravy teehe
2023-03-09 12:39:56 -05:00
Cameron Taylor
bf7a42d143
Merge pull request #20 from FunkinCrew/chart-editor-fixes-with-dave
...
Chart editor fixes with dave
2023-03-08 13:24:39 -05:00
Cameron Taylor
f9a7e309fb
score change
2023-03-02 04:20:03 -05:00
EliteMasterEric
75b4c732db
Mac fix, doh!
2023-03-01 18:22:28 -05:00
EliteMasterEric
fe92d00a04
Numerous chart editor fixes.
2023-02-28 21:06:09 -05:00
Cameron Taylor
9ef5974e52
build fix?
2023-02-22 15:30:58 -05:00
Cameron Taylor
9ff3d4355d
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2023-02-22 15:01:07 -05:00
Cameron Taylor
dd73539294
inputSpitter for ravy
2023-02-22 14:46:46 -05:00
EliteMasterEric
e035adab72
Merge branch 'feature/flxanimate'
2023-02-21 21:01:22 -05:00
EliteMasterEric
cdd8cd2ed2
Basic working tankman sprites and cutscenes
2023-02-21 20:58:15 -05:00
Cameron Taylor
ca443411be
stage edit funny moments
2023-02-03 18:10:06 -05:00
Cameron Taylor
0f9d0a6c98
stage editor in progress
2023-01-27 02:38:37 -05:00
EliteMasterEric
634258535c
Applied new code style to source/ and assets/data/
2023-01-22 22:25:45 -05:00
EliteMasterEric
6d7913786e
Working events in chart editor
2023-01-22 19:55:30 -05:00
EliteMasterEric
7f9171203a
Merge branch 'feature/2-chart-2-editor'
2023-01-02 17:43:19 -05:00
EliteMasterEric
6d233b93e0
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2023-01-02 17:41:19 -05:00
EliteMasterEric
6b3c15348b
Autosave and save-on-quit for chart editor
2023-01-02 17:40:53 -05:00
EliteMasterEric
b3b7fb49c2
Difficulty selector and player previews
2022-12-17 15:19:42 -05:00
Cameron Taylor
e1f53d288d
freeplay highscore stuff
2022-12-16 17:10:22 -05:00
EliteMasterEric
a2d803cc83
Note quant snapping
2022-12-14 15:33:30 -05:00
Eric Myllyoja
234dc0ac19
Vocal group work
2022-12-13 17:38:55 -05:00
Eric Myllyoja
9db6f7f32a
Merge remote-tracking branch 'origin/feature/week-4-gameplay'
2022-12-08 19:52:09 -05:00
Eric Myllyoja
19b2f3799a
Chart wizard plus shader fixes
2022-12-08 19:33:47 -05:00
Cameron Taylor
6a01c3008c
proper result screen masking !
2022-12-07 02:29:48 -05:00
Cameron Taylor
3f28fdb92c
song name on result screen stuff WIP
2022-12-02 21:37:07 -05:00
Eric Myllyoja
7190a3b47a
Pico flips you off now
2022-11-14 23:30:35 -05:00
Eric Myllyoja
709cfab6a7
Merge branch 'feature/chart-editor'
2022-10-27 09:37:13 -04:00
Eric Myllyoja
6e8feecef1
Many improvements to chart system and song format logic
2022-10-26 01:14:29 -04:00
Eric Myllyoja
a423424715
Notifications and more
2022-10-13 21:32:19 -04:00
Eric Myllyoja
cedb224783
More chart editor progress (selection)
2022-10-12 21:42:40 -04:00
Eric Myllyoja
7d21d80915
Clipboard rework
2022-10-11 03:14:57 -04:00
Eric Myllyoja
175908f827
Updated chartformat v7
2022-10-10 20:04:09 -04:00
Eric Myllyoja
36a49affee
Chart editor basic difficulty switching
2022-10-07 00:37:21 -04:00
MasterEric
8a2e4687b2
Fixed TitleState not firing onBeat
2022-09-26 17:18:19 -04:00
Eric Myllyoja
679ca4aafb
Tweaks to song events
2022-09-24 15:02:10 -04:00
MasterEric
cdc23f0809
Working new chart format (not working everything else :') )
2022-09-24 01:28:39 -04:00
Cameron Taylor
182c7e3aa4
new highscore thingie
2022-09-23 16:28:17 -04:00
Cameron Taylor
4eb1b5bb78
quick and dirty new highscore check
2022-09-23 16:12:18 -04:00
Cameron Taylor
84b5c9e0fd
score popin thingie
2022-09-23 15:42:12 -04:00
Cameron Taylor
58fe9c8f8c
got g-friend codeed
2022-09-23 14:26:50 -04:00
Eric Myllyoja
bb5ed65d27
Further conductor/bpm stuff
2022-09-23 00:49:42 -04:00
Cameron Taylor
1a1ac2a866
timing stuff all nice XD
2022-09-22 16:21:31 -04:00
Cameron Taylor
becef12c9f
positioning enough...
2022-09-22 15:48:27 -04:00
Eric Myllyoja
9ebb566b2a
WIP on conductor rework
2022-09-22 06:34:03 -04:00
Cameron Taylor
46c15e76f1
colors and numbers teehee
2022-09-22 04:09:06 -04:00
Cameron Taylor
8cd96a7b0d
difficulties
2022-09-21 21:03:31 -04:00
Cameron Taylor
6b0e009b05
boom box stuff for results XD
2022-09-21 20:26:16 -04:00
Cameron Taylor
3f42d22d5b
name change stuff and some placements
...
also commit lol!
2022-09-21 18:01:48 -04:00
Cameron Taylor
7c0c09775a
results ending variations
2022-09-20 13:18:40 -04:00
Cameron Taylor
37267dd7e2
songs in progres
2022-09-20 13:01:37 -04:00
Cameron Taylor
afa1a9d13c
better combo stuf
2022-09-20 02:37:43 -04:00
Cameron Taylor
1dbb4099ec
basic result screen in progress counting tallies
2022-09-20 02:16:12 -04:00
Eric Myllyoja
7fbdbcdfad
Fix merge issues
2022-09-16 15:38:36 -04:00
Eric Myllyoja
79751222e1
Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor
2022-09-16 15:38:19 -04:00
Eric Myllyoja
3597b09a46
Finished song data loader
2022-09-16 15:37:00 -04:00
Cameron Taylor
f07d172219
data stuff moved OUT of Note.hx!
2022-09-16 01:44:50 -04:00
Eric Myllyoja
848874eaac
Fix merge conflicts
2022-09-14 22:28:37 -04:00
Eric Myllyoja
51a7282d40
Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor
2022-09-14 22:28:04 -04:00
Eric Myllyoja
194d8e6ce6
WIP on song data loading
2022-09-13 01:09:30 -04:00
Eric Myllyoja
3a085e9333
Combo counter tweaks, stage position tweaks
2022-09-08 02:48:51 -04:00
Eric Myllyoja
d84be39a5e
Minor tweaks and fixes
2022-09-07 22:57:40 -04:00
Eric Myllyoja
e3857d789f
Merge branch 'master' into feature/week-4-gameplay
2022-09-07 19:12:18 -04:00
Eric Myllyoja
eb3ad49a30
Work in progress on HaxeUI chart editor
2022-09-07 19:07:08 -04:00
Eric Myllyoja
f790cd8fd6
WIP
2022-09-06 00:59:54 -04:00
Eric Myllyoja
7c88032551
More code for Blazin, additional shaders
2022-09-03 22:21:54 -04:00
Eric Myllyoja
c26b3a828d
First work in progress for Blazin
2022-08-31 02:24:09 -04:00
Eric Myllyoja
31487c0a32
Logic for double cans, partial implementation of cans into 2hot
2022-08-27 02:02:29 -04:00
Cameron Taylor
eaab159c73
lit-up on street stage
2022-08-25 20:15:50 -04:00
Cameron Taylor
8f4855852e
BASE PROTOTYPE WORKING W/ HaxeUI
2022-08-24 05:44:22 -04:00
Eric Myllyoja
fe9a319814
Latest WIP on Weekend 1 appearance stuff
2022-08-16 20:26:34 -04:00
Eric Myllyoja
2760a9ae9a
Polished Week 4 light post code.
2022-07-24 14:44:17 -04:00
Eric Myllyoja
600c7e5441
F3 to toggle debug markers, various visual tweaks
2022-07-24 00:49:54 -04:00
Eric Myllyoja
aa0962fe62
Cleanup of GameOverSubstate, fix GF duck animation duration
2022-07-22 22:25:19 -04:00
Eric Myllyoja
c456355366
Scripted states and shaders.
2022-07-22 16:11:18 -04:00
Eric Myllyoja
4172fd861d
First prototype of can logic
2022-07-14 19:03:42 -04:00
Eric Myllyoja
ee3e1750df
Work in progress on Week 8 stuff (animation offsets, death animation)
2022-07-06 21:49:42 -04:00
Eric Myllyoja
05148ee4f0
GF now ducks (a little glitchy tho)
2022-06-12 00:53:39 -04:00
Eric Myllyoja
705d0ed5b9
Updated hmm deps, no more forks!
2022-06-12 00:02:49 -04:00
Eric Myllyoja
05db82c828
Added blood to henches, added moving limo, added dynamic GF combo/drop animations
2022-06-09 22:28:58 -04:00
Eric Myllyoja
1c62dc1274
First revision of henchmen killing.
2022-06-01 22:07:42 -04:00
Cameron Taylor
853820c56b
animation timing fixes
2022-05-30 23:59:12 -04:00
Eric Myllyoja
9dfbfad926
First test of Week 4 Gameplay, plus fixes for MultiSparrow
2022-05-29 21:40:13 -04:00
Cameron Taylor
64b40ce7b8
bf default cam position fix
2022-05-29 19:33:04 -04:00
Cameron Taylor
e844b93641
spookeez scared animation lightning fix
2022-05-29 19:13:21 -04:00
MtH
02255a61d9
oopy forgot the comment
2022-05-07 22:33:18 +02:00
MtH
8bd876ed1c
flipx
2022-05-07 22:07:09 +02:00
MtH
8e2eefb605
0.2.8 character positions, dont multiply zoom, chara scaling fix
2022-05-07 18:45:49 +02:00
Cameron Taylor
f37c2cbbf6
cameraOffset stuff defaulted properly
2022-05-03 14:07:18 -04:00
Cameron Taylor
d835bed813
senpai stage tweaks
2022-05-03 13:27:14 -04:00
Cameron Taylor
be995f0702
note styles in Note.hx that use StrumlineStyle
2022-05-03 13:02:37 -04:00
Cameron Taylor
3a327f5c5d
pico fixes teehee
2022-05-02 23:00:00 -04:00
Cameron Taylor
79ce2237fc
small cam fix anotha hehe
2022-05-01 15:23:09 -04:00
Cameron Taylor
769969898b
camera positioning fixes
2022-05-01 15:20:15 -04:00
Eric Myllyoja
5bb1376459
Added cornerPosition and feetPosition properties for easy reference
2022-04-29 23:51:52 -04:00
Cameron Taylor
282e93e1ff
character repositioning proof of concept stuf
2022-04-29 23:46:41 -04:00
Cameron Taylor
231f76c893
pixel icon placement fix
2022-04-29 21:45:56 -04:00
Cameron Taylor
31b393b014
character animation dance force is OFF
2022-04-29 11:56:08 -04:00
Cameron Taylor
60e0668e74
icon fixes (week 4 + positions)
2022-04-29 00:22:42 -04:00
Cameron Taylor
e24de498a1
import fix + weird git merge thing lol (doesnt build)
2022-04-28 23:46:37 -04:00
Eric Myllyoja
43dbce2be1
Merge remote-tracking branch 'origin/feature/scripted-modules' into feature/scripted-characters
2022-04-18 20:39:41 -04:00
Eric Myllyoja
e4e516dd30
Crash fix for Stress
2022-04-18 20:09:02 -04:00
Eric Myllyoja
0b17f74f48
Merge remote-tracking branch 'origin/master' into feature/scripted-modules
2022-04-18 19:46:39 -04:00
Eric Myllyoja
d5d1c0ae95
Merge branch 'feature/scripted-modules' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-modules
2022-04-18 19:36:18 -04:00
Eric Myllyoja
b6da0b5e20
Fixed Week 4 boppers and car.
2022-04-18 19:36:09 -04:00
Cameron Taylor
b145e7629f
html5 fixes... again lol
2022-04-18 15:00:12 -04:00
Eric Myllyoja
25dc011df2
Many bug fixes; combo meter now works; main menu graphics split up
2022-03-29 21:56:04 -04:00
Eric Myllyoja
4b7744f4e3
Additional fixes for health icons and camera positioning.
2022-03-26 22:18:26 -04:00
Eric Myllyoja
3634346072
Stable, only position adjustments needed.
2022-03-25 22:30:37 -04:00
Eric Myllyoja
386e8db830
Ported all base game characters
2022-03-23 01:18:23 -04:00
Eric Myllyoja
a7d338becb
First iteration of stable custom characters, plus some other neat changes.
2022-03-21 00:19:05 -04:00
Cameron Taylor
10bafff63e
Merge branch 'master' into feature/scripted-stages
2022-03-18 21:54:16 -04:00
Cameron Taylor
5f98aa7fb5
busted input fix (breaks pyro test probably)
2022-03-18 21:47:30 -04:00
Cameron Taylor
a40a4663d8
parse animate removed an import lol!
2022-03-18 12:28:25 -04:00
Eric Myllyoja
1a85b4a1ce
First WIP of scripted characters (NOT WORKING)
2022-03-17 01:40:08 -04:00
Eric Myllyoja
60c6e5ee29
Various bug fixes for strumlines
2022-03-14 20:48:45 -04:00
Eric Myllyoja
1935373963
Hide song name in play state
2022-03-13 14:47:59 -04:00
Eric Myllyoja
0cc4f8a982
Scripted modules are stable but missing some features.
2022-03-13 14:36:03 -04:00
Eric Myllyoja
49b2907a30
Scripted module and script event systems, reworked strumlines.
2022-03-11 01:30:01 -05:00
Cameron Taylor
d477320894
xmas mall positioning fix (plus score reset, lol!)
2022-03-09 18:57:36 -05:00
Cameron Taylor
ef665df9d0
hold note balance shit lol! unrelated to polymod!!
2022-03-09 15:04:35 -05:00
Cameron Taylor
9dcffaa3fa
spirit layering fix
2022-03-09 14:06:10 -05:00
Eric Myllyoja
19cda4ed15
Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages
2022-03-09 10:36:39 -05:00
Eric Myllyoja
57fcb74657
Spirit trail is now behind
2022-03-09 10:36:13 -05:00
Cameron Taylor
45b9d725f2
tankman cloud reset?
2022-03-09 10:29:03 -05:00
Eric Myllyoja
404b2b648e
Modified every file in the codebase to solve a single bug.
2022-03-08 03:13:53 -05:00