EliteMasterEric
72a3742890
Fixes and improvements to LatencyState
2024-04-04 19:46:08 -04:00
EliteMasterEric
07092269b8
Merge branch 'rewrite/master' into input-offsets
2024-04-04 18:45:16 -04:00
EliteMasterEric
823baa3326
Add new album roll animation (again)
2024-04-04 16:30:04 -04:00
Cameron Taylor
acb58a6b49
remove sitelock
2024-04-04 05:41:44 -04:00
Cameron Taylor
8f3406cb0e
Merge branch 'rewrite/master' into feature/results-screen-score
2024-04-04 05:34:29 -04:00
Cameron Taylor
544dcdf809
Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1
2024-04-04 05:32:26 -04:00
Cameron Taylor
ec47ee4285
Merge pull request #461 from FunkinCrew/bugfix/debuggercheckbox-crash
...
Prevent a crash trying to open a non-existant debugger checkbox.
2024-04-04 05:30:41 -04:00
Cameron Taylor
eed8299cfd
Merge branch 'rewrite/master' into bugfix/hide-freeplay-menu-rating
2024-04-04 04:47:45 -04:00
Cameron Taylor
c23f97917c
Merge branch 'rewrite/master' into preloader-polish
2024-04-04 03:43:23 -04:00
EliteMasterEric
57d6ed118d
Hide Rating on the right side of the items in Freeplay
2024-04-04 03:31:03 -04:00
EliteMasterEric
f129cb7997
Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs
2024-04-03 21:57:29 -04:00
EliteMasterEric
58427363d1
Prevent a crash trying to open a non-existant debugger checkbox.
2024-04-03 20:33:51 -04:00
EliteMasterEric
e9d8546737
More results screen changes
2024-04-03 04:52:12 -04:00
Cameron Taylor
ad39ce3c21
local conductor got removed somewhere?
2024-04-03 04:43:12 -04:00
Cameron Taylor
b7c6b1aaf6
Merge pull request #458 from FunkinCrew/bugfix/a-couple-more-fixes
...
Bugfix/a couple more fixes
2024-04-03 03:38:37 -04:00
Cameron Taylor
668f47f761
Merge pull request #457 from FunkinCrew/html5/touch-to-start
...
Fix some build issues with HTML5.
2024-04-03 03:37:41 -04:00
EliteMasterEric
f7141e7096
Fixed an issue with save data not loading defaults properly.
2024-04-03 01:41:52 -04:00
EliteMasterEric
2b4bf42ac4
Fix multiple music, and crashes in freeplay
2024-04-03 01:41:47 -04:00
EliteMasterEric
f7ff381bc7
Fix some build issues with HTML5.
2024-04-02 23:33:10 -04:00
EliteMasterEric
90cf53b959
Someone forgot to merge assets from the credits branch.
2024-04-02 17:27:29 -04:00
Cameron Taylor
dcffe0537f
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
2024-04-01 22:40:10 -04:00
Cameron Taylor
03cbba4a4e
Merge branch 'rewrite/master' into feature/freeplay-ost-text
2024-04-01 22:21:29 -04:00
Cameron Taylor
d6723a8212
Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition
2024-04-01 22:14:29 -04:00
Cameron Taylor
8a60115df6
Merge pull request #454 from FunkinCrew/feature/erect-filter-freeplay
...
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 22:08:25 -04:00
Cameron Taylor
db89e199c4
Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
...
Bunch of results screen fixes
2024-04-01 22:07:43 -04:00
Cameron Taylor
7fb4b47e2a
Merge branch 'rewrite/master' into feature/credits
2024-04-01 22:06:58 -04:00
EliteMasterEric
67e096e443
Bunch of results screen fixes
2024-04-01 21:59:53 -04:00
EliteMasterEric
1df4a354cb
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 18:34:26 -04:00
Cameron Taylor
32ed26ffa6
stereo preloader in progress
2024-03-29 17:54:20 -04:00
EliteMasterEric
7c04630bb7
Fix a bug where duplicate notes would get placed at the beginning
2024-03-29 00:49:02 -04:00
EliteMasterEric
ddb41c9ef7
Increase AFK timer, and add SFX over it
2024-03-28 23:13:47 -04:00
EliteMasterEric
342782c3d3
Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu
2024-03-28 22:33:50 -04:00
EliteMasterEric
443a501e4e
Merge branch 'rewrite/master' into feature/freeplay-ost-text
2024-03-28 20:33:17 -04:00
EliteMasterEric
571c6d5960
Merge branch 'rewrite/master' into feature/credits
2024-03-28 20:29:15 -04:00
Eric
5fa559dfb1
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
2024-03-28 20:26:45 -04:00
EliteMasterEric
35f99b49a4
Merge branch 'rewrite/master' into input-offsets
2024-03-28 20:23:31 -04:00
EliteMasterEric
6a131555f8
Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support
2024-03-28 20:15:32 -04:00
Cameron Taylor
86c91d1e82
Merge pull request #436 from FunkinCrew/feature/touch-here-to-play
...
New Funkin' Preloader, and Touch Here To Play
2024-03-28 07:15:53 -04:00
EliteMasterEric
8a9eee3aa3
Rework Funkin Preloader and added "Touch to Play" graphic
2024-03-28 04:34:43 -04:00
EliteMasterEric
6ab6458e2a
Merge remote-tracking branch 'origin/rewrite/master' into feature/credits
2024-03-28 03:00:45 -04:00
EliteMasterEric
3a86b47292
Fix issue where main menu music wouldn't play after credits.
2024-03-28 02:57:51 -04:00
EliteMasterEric
5311b043ac
Rework credits data structure.
2024-03-28 02:57:22 -04:00
EliteMasterEric
b13c6563df
Fix issues with Freeplay OST text and add animations.
2024-03-28 01:46:50 -04:00
EliteMasterEric
201e018f25
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes
2024-03-28 00:03:09 -04:00
EliteMasterEric
893822532e
Fix an issue causing the Kickstarter video to not play
2024-03-28 00:01:42 -04:00
Cameron Taylor
0f80f1c8a6
Merge pull request #417 from FunkinCrew/bugfix/freeplay-afk-fixes
...
Bugfix/freeplay afk fixes
2024-03-27 21:08:08 -04:00
Cameron Taylor
3181795985
remove trace() calls from ages ago while im here
2024-03-27 20:58:58 -04:00
EliteMasterEric
463e946b17
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes
2024-03-27 01:40:22 -04:00
EliteMasterEric
4209c5156e
Readd a missing sound in the story menu
2024-03-27 01:02:11 -04:00
Eric
88c973f1ae
Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes
2024-03-26 19:35:10 -04:00
EliteMasterEric
1e888658f7
First implementation of credits state.
2024-03-26 12:33:54 -04:00
EliteMasterEric
90f861628d
Fix an HTML5 build issue.
2024-03-25 21:09:02 -04:00
Cameron Taylor
ccfb9ca65b
Merge branch 'rewrite/master' into feature/high-erect
2024-03-25 16:02:09 -04:00
Cameron Taylor
fe6cb8c5a9
Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul
...
Funkin Sound overhaul
2024-03-25 15:59:02 -04:00
EliteMasterEric
51d36ea25e
Work in progress on fixing Boyfriend's spook/tv animations
2024-03-24 04:53:05 -04:00
EliteMasterEric
24b03e4f6b
Replace calls to FlxG.sound.playMusic with ones that set the BPM.
2024-03-23 23:38:07 -04:00
EliteMasterEric
a8486a47df
Fix a bug where the album disappears never to return
2024-03-23 18:22:15 -04:00
EliteMasterEric
6407770ed6
Rework every class to use FunkinSound.
2024-03-23 17:50:48 -04:00
EliteMasterEric
dc638a1303
Fix a bunch of merge bugs.
2024-03-23 15:34:37 -04:00
EliteMasterEric
831d6aae71
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
2024-03-23 14:38:50 -04:00
Cameron Taylor
01e83d4713
the funkin crew presents
2024-03-22 20:21:09 -07:00
Cameron Taylor
a695fb2b39
Merge branch 'rewrite/master' into formatting-fixes
2024-03-22 19:00:29 -07:00
EliteMasterEric
aea9213eea
Make sure the BPM label gets updated properly
2024-03-22 03:04:33 -04:00
EliteMasterEric
4524b66170
Only show easy/normal/hard in story mode for now
2024-03-22 02:47:43 -04:00
Cameron Taylor
f7acee94cd
Merge branch 'rewrite/master' into feature/freeplay-album-art
2024-03-21 23:37:20 -07:00
Cameron Taylor
80c938af4f
fix for the album roll to come in only once bf hand hits
2024-03-21 23:34:03 -07:00
Cameron Taylor
433d4968da
change to elasticOut
2024-03-21 23:32:07 -07:00
Eric
fe2e272abb
Merge branch 'rewrite/master' into title-music-vol-fix
2024-03-22 00:17:03 -04:00
EliteMasterEric
2b91c0f926
Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening
2024-03-22 00:06:55 -04:00
EliteMasterEric
5e0de6d1ce
Fix some issues with events unintentionally sharing data after being edited via the toolbox.
2024-03-21 23:57:26 -04:00
Eric
662688023a
Merge branch 'rewrite/master' into title-music-vol-fix
2024-03-21 22:57:18 -04:00
EliteMasterEric
1f81e92827
Scrapped the weird FlxAltasSprite stuff and just used a tween. Also fixed some bugs with story menu
2024-03-21 00:38:52 -04:00
EliteMasterEric
3975d34b70
Fix scoring lerp issue on story menu.
2024-03-20 23:06:32 -04:00
EliteMasterEric
36a9c29720
Work in progress on custom album art for freeplay
2024-03-20 14:37:24 -04:00
EliteMasterEric
3a35be916b
A bunch of checkstyle fixes
2024-03-16 22:20:22 -04:00
EliteMasterEric
d56c33cd17
Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!).
2024-03-16 00:55:57 -04:00
EliteMasterEric
e4eb543fa7
Fix a bug where title music starts blaringly loud.
2024-03-15 21:53:07 -04:00
Cameron Taylor
d68ea0eb46
lil polish
2024-03-14 19:40:07 -07:00
Cameron Taylor
82383018f6
funkin soundtray
2024-03-14 19:27:07 -07:00
Jenny Crowe
42506909f7
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-14 15:24:51 -07:00
Cameron Taylor
3aada18a59
title screen volume fix
2024-03-14 04:03:33 -07:00
Cameron Taylor
c4550ca773
Merge branch 'rewrite/master' into bugfix/github-force-debug
2024-03-14 03:09:05 -07:00
Cameron Taylor
e0eb00d01a
Merge branch 'rewrite/master' into feature/pico-flicker
2024-03-13 21:51:58 -07:00
Cameron Taylor
1211dbb6e8
Merge branch 'rewrite/master' into feature/chart-editor-song-scripts
2024-03-13 21:26:50 -07:00
Cameron Taylor
c8b74ccce2
Merge branch 'rewrite/master' into feature/debugger-popup-fixes
2024-03-13 18:54:24 -07:00
Cameron Taylor
b9ab38e0b9
timertools -> timerutil fix
2024-03-13 18:47:15 -07:00
Cameron Taylor
1a224423f9
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into bugfix/precache-library-assets
2024-03-13 18:41:45 -07:00
EliteMasterEric
d22cb1a96f
Fix some issues resulting in release builds breaking!
2024-03-13 17:38:00 -04:00
EliteMasterEric
a13dc6e585
Remove deprecated imports.
2024-03-13 12:07:06 -04:00
EliteMasterEric
66085ff867
Song scripts can now be (optionally) enabled in the Chart Editor playtest
2024-03-12 21:34:50 -04:00
EliteMasterEric
09e52e47ae
Commit an unsaved file
2024-03-12 18:01:09 -04:00
EliteMasterEric
bbaf8dfb3e
Debugger popup fixes
2024-03-12 17:57:52 -04:00
EliteMasterEric
be8f5699b5
2hot stutter actually fixed!
2024-03-11 23:42:32 -04:00
Jenny Crowe
6b8fb7dc77
Standardized camera zoom tweening to match camera follow tweening. Implemented methods to cancel tweens in necessary places. Start of pausing tweens when pausing the game (WIP). (CHANGES NOT TESTED EXPECT SOMETHING TO BREAK)
2024-03-10 16:35:41 -07:00
Jenny Crowe
f9291d6458
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-10 14:51:24 -07:00
Cameron Taylor
25cb73316c
Merge branch 'rewrite/master' into bugfix/html5-array-clone
2024-03-10 13:46:49 -04:00
Cameron Taylor
528b01d739
assets submod
2024-03-10 13:34:40 -04:00
EliteMasterEric
09029718aa
Fix an issue where story menu characters bop too fast
2024-03-08 21:33:06 -05:00
EliteMasterEric
a7b531e57f
Fix swapped entries in Blazin' dropdown.
2024-03-08 15:07:10 -05:00
EliteMasterEric
f671cc8569
Remove DynamicAccessTools entirely.
2024-03-06 14:13:48 -05:00
EliteMasterEric
2fa1d18dce
Fix build
2024-03-06 12:29:54 -05:00
Cameron Taylor
1fe554e24e
Merge pull request #371 from FunkinCrew/bugfix/FPIQ-286
...
Remove DynamicTools; fix pause menu on HTML5
2024-03-06 02:30:39 -05:00
Cameron Taylor
60223b3f12
Merge pull request #369 from FunkinCrew/bugfix/offset-toolbox-floats
...
offset toolbox floats fix
2024-03-06 02:23:16 -05:00
Mike Welsh
a516e9199f
Remove DynamicTools; fix pause menu on HTML5
...
Calls intended for `ArrayTools.clone` were being routed to
`DynamicTools.clone` due to the order of `using` statements in
`imports.hx`. This caused the pause menu to break due to arrays
becoming fubar (missing length property).
Using `DynamicTools` is a little dangerous, so remove it in favor
of calling `Reflect.copy` directly.
2024-03-05 23:21:57 -08:00
FabsTheFabs
6bc1eb7278
typo oops
2024-03-06 05:06:57 +00:00
FabsTheFabs
607b5757fd
added decimal point to waveform duration
2024-03-06 05:05:03 +00:00
Cameron Taylor
1ebfeb3a89
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/script-event-note-incoming
2024-03-05 23:57:53 -05:00
EliteMasterEric
1b1834e98b
Implement a botplay checkbox in the chart editor
2024-03-05 22:27:07 -05:00
EliteMasterEric
059e1c0e13
Implement onNoteIncoming script event.
2024-03-05 21:48:04 -05:00
Eric
e76a94b682
Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod
2024-03-05 14:11:54 -05:00
EliteMasterEric
9212ea9c90
Script fixes for 2hot explosions breaking Polymod
2024-03-05 02:29:44 -05:00
EliteMasterEric
ae5f48c29c
Fix issues with story mode colors breaking
2024-03-05 00:22:29 -05:00
Jenny Crowe
132eda6715
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-04 20:57:54 -07:00
Jenny Crowe
d9cf097e46
Fixed bools and associated checkboxes not updating properly.
2024-03-04 20:57:21 -07:00
Cameron Taylor
fa72fa44b1
tallies for story mode
2024-03-04 21:18:40 -05:00
Cameron Taylor
ae7d8b9046
Merge branch 'rewrite/master' into feature/blazin-animation-work
2024-03-04 18:11:11 -05:00
EliteMasterEric
73cf6b9fd2
Rewrite save data to fix scripted story levels. Add a "pre-transition death delay"
2024-03-04 16:37:42 -05:00
Hazel
0a19c7a8cb
fix(ci), feat(ci), refactor: i don't need sleep, i need answers ( #357 )
...
* hx the codec
* fix(ci,html5): use haxe.Timer instead of Sys.time
* refactor(compat): use haxe.Timer instead of Sys.time(), introduce TimerUtil to reduce code dupe
* fix: redundant types
* refactor(style): use TimerTools in place of haxe.Timer
* refactor: consistent timer code
* feat: build timings
* refactor(ci): cleanup ci configs
* sigh
* sigh, 2
* fix: haxelib deleterepo does not silently fail
* retrigger ci
* verbose output
* debug info after haxelib gti
* force haxelib git override
* more debug info
* force bash
* at least haxelib is consistent now
* fix the runners first, then do that
* update ci-haxe
* it is time?
* deleterepo may fail
* finishing touches
2024-03-02 23:49:27 -05:00
EliteMasterEric
761a3d53df
Taunt improvements.
2024-03-02 23:23:52 -05:00
EliteMasterEric
f7a3d43e54
Fixes to animation looping and holds
2024-03-02 22:46:13 -05:00
EliteMasterEric
684eb919b5
Make the playback rate option explicit so it doesn't break in the future.
2024-02-29 18:49:20 -05:00
Cameron Taylor
e36629a41f
Merge branch 'rewrite/master' into feature/new-pause-menu
2024-02-29 13:53:55 -05:00
EliteMasterEric
1d70ff95f9
Several chart editor fixes (more precise playback speed, live input mode loads properly from save)
2024-02-28 21:19:21 -05:00
EliteMasterEric
5d030b8a31
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu
2024-02-28 03:04:56 -05:00
EliteMasterEric
cecddbc2ee
Fixed issues with audio in Week 6 after skipping the cutscene.
2024-02-28 03:01:20 -05:00
EliteMasterEric
13d6ba378e
Work in progress on fixing Week 6
2024-02-28 00:19:08 -05:00
EliteMasterEric
66c91d8b3e
Sort the chart editor note kind dropdown.
2024-02-23 03:23:00 -05:00
EliteMasterEric
e349b0bb49
New pre-caching techniques should reduce stuttering on Weekend 1.
2024-02-23 00:16:11 -05:00
EliteMasterEric
ddfb0c6a61
Working on more asset caching improvements.
2024-02-22 23:37:52 -05:00
EliteMasterEric
11bb69002b
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-22 21:01:07 -05:00
EliteMasterEric
01ed1730f4
Fix some issues with cutscenes.
2024-02-22 20:56:41 -05:00
EliteMasterEric
572ecc8aa8
Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs
2024-02-22 19:05:20 -05:00
EliteMasterEric
539b688055
Exploration in expanding FunkinSprite for optimization
2024-02-22 18:55:24 -05:00
EliteMasterEric
0b49a88cdd
Move the crash keybind into a global plugin.
2024-02-22 01:47:35 -05:00
EliteMasterEric
744e2f95bd
Add additional memory utilities and logging.
2024-02-22 00:06:02 -05:00
EliteMasterEric
907d9150c0
Add additional memory utilities and logging.
2024-02-21 17:10:18 -05:00
EliteMasterEric
36c0c61946
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-20 18:44:51 -05:00
EliteMasterEric
d888fb860d
Remove support for >100% audio since it didn't actually boost the gain.
2024-02-20 13:37:53 -05:00
Cameron Taylor
2cfeb2c94d
anim editor dropdown fix
2024-02-20 00:29:11 -05:00
Cameron Taylor
85b3441a03
tiny levelitems positioning
2024-02-19 21:40:52 -05:00
Cameron Taylor
63a49010ba
positioning and average reset
2024-02-19 20:56:57 -05:00
Cameron Taylor
6e691c66c3
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into input-offsets
2024-02-19 20:33:36 -05:00
Jenny Crowe
7d7cf32f44
Chart editor grid now updates when changing the song BPM. HItsound volumes converted to two separate sliders.
2024-02-19 18:18:32 -07:00
EliteMasterEric
44623071cd
Redo event stuff for abot and game over audio logic
2024-02-18 03:02:36 -05:00
Eric
1c8fd7251c
Merge pull request #322 from FunkinCrew/storymode-nene-fix
...
hide storymode menu characters if they dont exist for the level
2024-02-17 19:26:05 -05:00
EliteMasterEric
12335fef9d
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-17 15:18:23 -05:00
Cameron Taylor
0a83f2f1e8
Merge branch 'rewrite/master' into feature/chart-editor-note-kind
2024-02-17 05:26:58 -05:00
Cameron Taylor
2baac0e983
dont infinitely add new props, replace the old ones
2024-02-17 04:21:03 -05:00
Cameron Taylor
41cb3d93b2
nicer color tweens
2024-02-17 04:01:06 -05:00
Cameron Taylor
fc3b83367f
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into storymode-nene-fix
2024-02-17 03:49:54 -05:00
