EliteMasterEric
893822532e
Fix an issue causing the Kickstarter video to not play
2024-03-28 00:01:42 -04:00
EliteMasterEric
b771b46f1c
Fix a build issue.
2024-03-28 00:01:18 -04:00
EliteMasterEric
f267a72783
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-audio
2024-03-27 23:00:34 -04:00
Cameron Taylor
53d62c3c12
Merge branch 'rewrite/master' into bugfix/pico-fixes
2024-03-27 22:14:44 -04:00
Cameron Taylor
96fe131544
Merge pull request #430 from FunkinCrew/feature/miss-judgement-debug
...
Add debug logging to Flixel debugger for miss judgements
2024-03-27 21:56:18 -04:00
Cameron Taylor
77b65ba68c
shader var renames for hashlink
2024-03-27 21:32:13 -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
195f366b65
Fix an issue where the Random button would crash Freeplay.
2024-03-27 17:43:15 -04:00
EliteMasterEric
f1811a8594
Implement Pico pause music
2024-03-27 17:42:29 -04:00
EliteMasterEric
77cf96716e
Work in progress on Conductor signal rework
2024-03-27 02:55:53 -04:00
EliteMasterEric
bb98c710a3
Merge remote-tracking branch 'origin/rewrite/master' into feature/conductor-signal-rework
2024-03-27 01:52: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
843095e3de
Add debug logging to Flixel debugger for miss judgements
2024-03-27 01:25:38 -04:00
Cameron Taylor
cccfdd0638
Merge branch 'rewrite/master' into feature/more-new-charts
2024-03-27 01:09:45 -04:00
EliteMasterEric
4209c5156e
Readd a missing sound in the story menu
2024-03-27 01:02:11 -04:00
EliteMasterEric
6b35898ed9
Fix some issues with Weekend 1.
2024-03-26 23:24:59 -04:00
EliteMasterEric
0e93f2ab27
Improve error logging when the game can't find a chart file.
2024-03-26 21:30:08 -04:00
EliteMasterEric
9ebb253b53
Fix music updating issue.
2024-03-26 19:38:56 -04:00
EliteMasterEric
e84fdf9fac
Resolve FlxG.sound.music crash
2024-03-26 19:38:42 -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
Cameron Taylor
524ae119fa
Merge branch 'rewrite/master' into bugfix/blazin-crashes
2024-03-26 01:30:59 -04:00
EliteMasterEric
8943cd117e
Make the error message a bit better if an Animate atlas fails to parse.
2024-03-26 01:12:46 -04:00
EliteMasterEric
5ae075e947
Fix a couple Flixel warnings on the results screen.
2024-03-25 21:09:14 -04:00
EliteMasterEric
90f861628d
Fix an HTML5 build issue.
2024-03-25 21:09:02 -04:00
EliteMasterEric
07ad250060
Fix an audio crash when exiting a cutscene
2024-03-25 21:08:39 -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
Cameron Taylor
6a0672684c
Merge pull request #416 from FunkinCrew/bugfix/camera-zoom-option
...
Fix a bug where the Camera Zoom toggle didn't work.
2024-03-25 14:52:24 -04:00
Cameron Taylor
9fd780e00c
Merge branch 'rewrite/master' into bugfix/cut-pico-dadbattle
2024-03-25 13:42:50 -04:00
Cameron Taylor
c456430910
Merge pull request #414 from FunkinCrew/bugfix/opponent-mute-on-miss
...
Fix a bug where lag could cause the opponent to miss which would mute the vocals.
2024-03-25 13:37:12 -04:00
Cameron Taylor
3c9f63892b
Merge pull request #411 from FunkinCrew/feature/video-cutscene-hide
...
Hide a video cutscene after playing it
2024-03-25 13:37:00 -04:00
EliteMasterEric
51d36ea25e
Work in progress on fixing Boyfriend's spook/tv animations
2024-03-24 04:53:05 -04:00
EliteMasterEric
138dfd61e8
Fix a bug where the Camera Zoom toggle didn't work.
2024-03-23 23:52:08 -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
709fbc8594
Fix a bug where lag could cause the opponent to miss.
2024-03-23 18:11:06 -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
Eric
8e8ec2c5aa
Merge branch 'rewrite/master' into funkin-crew-presents
2024-03-22 23:55:05 -04:00
EliteMasterEric
e4a9d25ac0
Syntax fix
2024-03-22 23:53:29 -04:00
EliteMasterEric
471b015d1a
Add some FlxSignals and showVideo/hideVideo
2024-03-22 23:46:03 -04:00
Cameron Taylor
932f7bce41
Merge pull request #408 from FunkinCrew/bugfix/camera-behavior-fixes
...
Make the ZoomCamera events use sensible defaults.
2024-03-22 23:38:26 -04:00
Cameron Taylor
01e83d4713
the funkin crew presents
2024-03-22 20:21:09 -07:00
EliteMasterEric
28088146eb
Fix bug where Pico dadbattle was playing over normal dadbattle
2024-03-22 22:17:34 -04:00
Cameron Taylor
a695fb2b39
Merge branch 'rewrite/master' into formatting-fixes
2024-03-22 19:00:29 -07:00
EliteMasterEric
83e8865a24
Make the ZoomCamera events use sensible defaults.
2024-03-22 20:29:35 -04:00
EliteMasterEric
e64637ffdf
Rework Conductor to use instanced signals
2024-03-22 19:51:47 -04:00
Cameron Taylor
7d008e7247
playstate camera fixie
2024-03-22 15:03:17 -07:00
Cameron Taylor
9d7831d40b
Merge branch 'rewrite/master' into bugfix/minimal-mode-gameover
2024-03-22 14:56:41 -07:00
EliteMasterEric
c765249030
Complain if the main metadata file specifies a variation (like erect) but the game can't find it.
2024-03-22 03:04:52 -04:00
EliteMasterEric
aea9213eea
Make sure the BPM label gets updated properly
2024-03-22 03:04:33 -04:00
EliteMasterEric
2b477c9bd1
Make Conductor a lazy instance
2024-03-22 02:47:56 -04:00
EliteMasterEric
4524b66170
Only show easy/normal/hard in story mode for now
2024-03-22 02:47:43 -04:00
EliteMasterEric
d50ff73d3c
Registries now get added to the Flixel console (and get lazy instantiated so they don't start before the game does)
2024-03-22 02:47:21 -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
efa0e103b0
Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars
2024-03-21 21:54:22 -04:00
EliteMasterEric
2069bf1d89
Merge remote-tracking branch 'origin/rewrite/master' into soundtray
2024-03-21 21:49:04 -04:00
EliteMasterEric
105aca4707
Fix an issue where hidden difficulties could end up in the difficulty list.
2024-03-21 19:44:02 -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
Cameron Taylor
99cb7263ca
Merge pull request #399 from FunkinCrew/bugfix/html5-video-pausing
...
Rework HTML5 video cutscenes to properly support the pause menu and volume controls.
2024-03-20 18:33:25 -04:00
EliteMasterEric
36a9c29720
Work in progress on custom album art for freeplay
2024-03-20 14:37:24 -04:00
EliteMasterEric
566a271a63
Fix several crashes when reaching a game over in minimal mode
2024-03-19 23:25:56 -04:00
Eric
41b9ba9bce
Merge branch 'rewrite/master' into a-bot-bars
2024-03-19 22:33:02 -04:00
Cameron Taylor
186fdfdead
Merge branch 'a-bot-bars' of github.com:FunkinCrew/Funkin-secret into a-bot-bars
2024-03-19 13:05:12 -07:00
Cameron Taylor
4eea9b76e7
idk assets revert this if I busted shit here lol
2024-03-19 13:04:58 -07:00
EliteMasterEric
42eec66753
Rework HTML5 video cutscenes to properly support the pause menu and volume controls.
2024-03-19 15:56:00 -04:00
EliteMasterEric
9eda84019d
Merge branch 'rewrite/master' into a-bot-bars
2024-03-19 13:34:06 -04:00
EliteMasterEric
3a35be916b
A bunch of checkstyle fixes
2024-03-16 22:20:22 -04:00
Jenny Crowe
494a3c9e86
Bugfixes. New additive zoom mode for camera tweening.
2024-03-16 08:38:10 -07: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
EliteMasterEric
ea491e57a0
Switch "Skip Cutscene" and "Restart Cutscene" (Dave's request)
2024-03-15 17:16:44 -04:00
EliteMasterEric
f31634351b
Fix an issue where stage character scale was overriding base character scale.
2024-03-15 16:45:18 -04:00
Jenny Crowe
1541f0aa68
Camera tween pausing/unpausing additions
2024-03-15 01:52:22 -07: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
b5bc63feca
use isMinimalMode
2024-03-13 21:27:09 -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
43cf1e71e2
Disable camera events in the minimal playtest.
2024-03-12 21:35:55 -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
Cameron Taylor
fbc5d9955d
Merge pull request #380 from FunkinCrew/bugfix/weekend-1-sing-time
...
Weekend 1: Fix default value for singTime to use correct unit.
2024-03-10 13:28:34 -04:00
EliteMasterEric
09029718aa
Fix an issue where story menu characters bop too fast
2024-03-08 21:33:06 -05:00
EliteMasterEric
9284f1495b
Fix default value for singTime to use correct unit.
2024-03-08 20:56:34 -05:00
EliteMasterEric
6edc274748
Merge branch 'rewrite/master' into a-bot-bars
2024-03-08 20:54:11 -05:00
EliteMasterEric
7d0d839cfb
Merge branch 'rewrite/master' into a-bot-bars
2024-03-08 20:03:15 -05:00
Cameron Taylor
7a5d48b290
Merge branch 'rewrite/master' into feature/blazin-touchups
2024-03-08 16:43:56 -05:00
EliteMasterEric
a7b531e57f
Fix swapped entries in Blazin' dropdown.
2024-03-08 15:07:10 -05:00
Eric
c40919f53f
Merge pull request #375 from FunkinCrew/bugfix/html5-video
...
Use correct resource URL when loading videos
2024-03-08 00:31:10 -05:00
Eric
bf6ec0421c
Merge branch 'rewrite/master' into result-screen-pitch
2024-03-08 00:30:08 -05:00
EliteMasterEric
1808f08554
Merge branch 'rewrite/master' into a-bot-bars
2024-03-08 00:21:51 -05:00
Cameron Taylor
d6608fe435
a-bot in progress
2024-03-07 14:19:26 -05:00
Cameron Taylor
427e4810ad
faster bf processing...
2024-03-07 03:57:16 -05:00
Mike Welsh
b0abef0d52
Use correct resource URL when loading videos
...
On HTML5, `VideoCutscene` was not stripping the library prefix
from the video file path, causing the video to fail to load.
Fixes FPIQ-281.
2024-03-06 23:37:50 -08:00
Mike Welsh
69b28ca42c
Add #if FLX_DEBUG in TrackerUtil
...
`Tracker.addProfile` only exists when FLX_DEBUG is set, so
add this conditional check to fix non-debug builds.
2024-03-06 22:48:44 -08:00
EliteMasterEric
332a81ec72
No longer miss notes during ending cutscene
2024-03-06 17:22:11 -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
EliteMasterEric
7a9bff248e
Fix an issue with array.clone() on HTML5
2024-03-06 12:24:25 -05:00
Cameron Taylor
b2d3fe17d7
fun lil pitch effect on result scren
2024-03-06 02:56:10 -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
Cameron Taylor
cdae96d179
Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod
2024-03-05 14:37:47 -05:00
Cameron Taylor
921ffb6526
Merge pull request #364 from FunkinCrew/bugfix/story-mode-color
...
Fix issues with story mode colors breaking
2024-03-05 14:35:45 -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
Eric
3aa4c23340
Merge branch 'rewrite/master' into bugfix/chart-editor-vocal-crash
2024-03-04 23:00:38 -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
Eric
3c88113d93
Merge branch 'rewrite/master' into bugfix/audio-focus
2024-03-04 22:46:14 -05:00
EliteMasterEric
08fb8be419
Redo combine tally implementation
2024-03-04 22:22:19 -05:00
Cameron Taylor
acc75c5c5c
use totalNotes instead of currentChart.notes.length
2024-03-04 21:25:56 -05:00
EliteMasterEric
d0f81add95
Fix a bug where Chart Editor Playtest destroys the vocals and crashes
2024-03-04 21:19:24 -05:00
Cameron Taylor
fa72fa44b1
tallies for story mode
2024-03-04 21:18:40 -05:00
Cameron Taylor
d2b124efca
some highscore tallies debugging stuf in progress
2024-03-04 20:47:23 -05:00
Jenny Crowe
d9a69dac10
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-04 18:20:00 -07:00
Cameron Taylor
7f4c36c8f4
some checkstyle stuff
2024-03-04 19:03:43 -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
Mike Welsh
5d00f57bfb
Properly handle pausing sounds with negative startTime
2024-03-04 03:43:17 -08:00
Mike Welsh
5557dbf28f
Avoid unpausing music when debugger is toggled
...
Workaround a Flixel issue where sounds can unpause after toggling
the Flixel debugger with F2, caused by the debugger throwing a
spurious onFocus event without an onFocusLost event.
2024-03-04 03:22:51 -08:00
Mike Welsh
fcce345454
Avoid null reference error with music
2024-03-04 02:26:54 -08:00
Jenny Crowe
abb4400e41
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-03 02:51:01 -07: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
fabs
f8481a0efe
fixed pico game over loop from playing a duplicate track ( #356 )
...
* fixed pico game over loop from playing a duplicate track that persists in menus
* assets submod
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2024-03-02 13:56:44 -05:00
EliteMasterEric
0294ea0b79
Implemented FlxAnimate characters into Blazin'.
2024-03-01 08:13:06 -05:00
Cameron Taylor
be348d0f13
moved vis code
2024-03-01 00:15:51 -05:00
Cameron Taylor
35d0feceb8
assets submod
2024-03-01 00:15:30 -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
Jenny Crowe
db80bba100
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-02-29 15:11:20 -07:00
Cameron Taylor
e36629a41f
Merge branch 'rewrite/master' into feature/new-pause-menu
2024-02-29 13:53:55 -05:00
Cameron Taylor
88f57cf520
pause menu tween polish
2024-02-29 13:53:09 -05:00
EliteMasterEric
0139d5c4f6
Fix a crash on atlas characters.
2024-02-29 01:19:32 -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
2252040241
Fix custom pause music in Week 6, improve documentation
2024-02-28 14:51:39 -05:00
EliteMasterEric
8683900922
Fixes to cutscene pausing.
2024-02-28 03:53:36 -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
Jenny Crowe
858d8edf7a
Cam tweening working! UI buggy af. To fix.
2024-02-27 23:29:40 -07:00
EliteMasterEric
13d6ba378e
Work in progress on fixing Week 6
2024-02-28 00:19:08 -05:00
Cameron Taylor
3764a5db3f
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into a-bot-bars
2024-02-27 22:41:08 -05:00
Cameron Taylor
ddeac1db15
deubbershish...
2024-02-27 22:02:04 -05:00
EliteMasterEric
12a48b9b86
Work in progress on revamped, more extensible pause menu.
2024-02-26 23:18:56 -05:00
EliteMasterEric
90360de0d0
Working Blazin cutscene and fixed time travel
2024-02-26 19:03:04 -05:00
Cameron Taylor
6f88865e0b
viz in progress
2024-02-23 04:00:31 -05:00
EliteMasterEric
66c91d8b3e
Sort the chart editor note kind dropdown.
2024-02-23 03:23:00 -05:00
EliteMasterEric
4168962fec
Revert "Fix FunkinSound not resuming after focus"
...
This reverts commit d6b3e2a9cf
2024-02-23 03:19:34 -05:00
EliteMasterEric
fb9fd57210
Improve json parsing error handling.
2024-02-23 03:16:51 -05:00
Cameron Taylor
b25aa3badb
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into a-bot-bars
2024-02-23 02:19:46 -05:00
Cameron Taylor
b261729fa3
abot positioning
2024-02-23 02:18:50 -05:00
Cameron Taylor
40a056078c
vispos
2024-02-23 02:03:34 -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
Eric
905d47c005
Merge branch 'rewrite/master' into anim-editor-stuffs
2024-02-22 19:07:31 -05:00
EliteMasterEric
572ecc8aa8
Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs
2024-02-22 19:05:20 -05:00
Cameron Taylor
e9dc03f8f1
Merge branch 'rewrite/master' into feature/screenshot-sound
2024-02-22 19:04:07 -05:00
EliteMasterEric
539b688055
Exploration in expanding FunkinSprite for optimization
2024-02-22 18:55:24 -05:00
Cameron Taylor
201c81cfef
changed keybind to ctrl+shift+L
2024-02-22 18:51:18 -05:00
EliteMasterEric
5b486e5634
Merge remote-tracking branch 'origin/bugfix/audio-focus' into feature/2hot-death-animation
2024-02-22 12:59:34 -05:00
EliteMasterEric
818e80ed74
Add a screenshot sound provided by Isaac.
2024-02-22 03:15:06 -05:00
Cameron Taylor
8a9a8bb179
abot bars in probress
2024-02-22 01:50:55 -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
01250852c5
simplified preloader
2024-02-17 04:45:12 -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
Cameron Taylor
316fa72b19
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into bugfix/loading-state
2024-02-17 03:44:16 -05:00
EliteMasterEric
16df3f0e9d
Move E to a final constant as Mike suggested.
2024-02-17 03:41:08 -05:00
EliteMasterEric
8a9a7f3b97
Additional chart editor fixes.
2024-02-17 02:13:11 -05:00
Mike Welsh
a523b82439
Fix songs failing to load on HTML5 target
...
Do a small refactor of `LoadingState` to fix loading songs on the
when `NO_PRELOAD_ALL` is defined.
This allows the HTML5 target to progress into song gameplay again.
2024-02-16 21:00:44 -08:00
EliteMasterEric
de8fe2e271
Merge branch 'feature/chart-editor-note-kind' into feature/2hot-death-animation
2024-02-16 22:46:06 -05:00
EliteMasterEric
1bc96afd6d
Move E to a final constant as Mike suggested.
2024-02-16 22:13:51 -05:00
EliteMasterEric
98e6d4091e
Revamp note kind handling in the chart editor.
2024-02-16 22:01:47 -05:00
Mike Welsh
ef96bd4358
Fix variable name in MathUtils.smoothLerp
2024-02-16 17:22:55 -08:00
Cameron Taylor
516c5e8596
Merge pull request #329 from FunkinCrew/feature/screenshots
...
Implemented a screenshot button.
2024-02-16 19:31:53 -05:00
Cameron Taylor
0b58a4f664
camera flash fix
2024-02-16 18:58:27 -05:00
Cameron Taylor
928f941c2f
Merge pull request #331 from FunkinCrew/bugfix/countdown-pause-music
...
Fix issue with incorrect music after pausing during countdown
2024-02-16 17:36:23 -05:00
Cameron Taylor
29e1c480fd
unwrap openFolder from #if sys
2024-02-16 16:35:57 -05:00
EliteMasterEric
e4cd694c15
ScreenshotPlugin now uses Player.controls. VolumePlugin is now outside MusicBeatState
2024-02-16 14:42:28 -05:00
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
2dbc0cda6e
Fix a missing import.
2024-02-13 03:18:51 -05:00
EliteMasterEric
c901763ad8
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-gamepad-support
2024-02-13 03:12:57 -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
0145d7ed2d
input offset edits in progress
2024-02-12 20:06:43 -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
EliteMasterEric
de1ddcbf4d
Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support
2024-02-02 23:15:48 -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
EliteMasterEric
c6b3499897
Finished up hold note placement on gamepad, implemented note preview playhead
2024-01-08 21:26:24 -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
EliteMasterEric
4804b9ae22
Work in progress for Chart Editor gamepad support (navigation implemented, note placement WIP)
2024-01-06 01:06:10 -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
Cameron Taylor
9ffffe9c8a
player char select
2023-12-11 02:40:58 -05:00
Cameron Taylor
181e3f85b8
switching opp
2023-12-11 02:26:37 -05:00
Cameron Taylor
ac3f27edd4
icon char select in progres
2023-12-11 00:19:33 -05:00
EliteMasterEric
e24c5877a9
Some quick fixes to get Mac to build.
2023-12-10 23:33:08 -05:00
Cameron Taylor
c3fa793d97
adds !isCursorOverHaxeUI around
2023-12-10 04:10:57 -05:00
Cameron Taylor
3a70ca4e08
menubar selected fix
2023-12-10 03:49:24 -05:00
Cameron Taylor
8cec180353
practice mode in progress
2023-12-10 03:37:12 -05:00
Cameron Taylor
7876b07c37
mac delete key fix
2023-12-09 18:00:32 -05:00
Cameron Taylor
87c866f662
copy notifier polish
2023-12-08 22:55:14 -05:00
Cameron Taylor
6f141e5f52
copy text popup
2023-12-08 22:28:34 -05:00
Cameron Taylor
796e1fcbab
note highlight preview
2023-12-08 20:21:55 -05:00
Cameron Taylor
1871b87630
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
2023-12-08 19:28:16 -05:00
Cameron Taylor
c99ac11d8a
opponent vocal
2023-12-08 18:44:45 -05:00
Cameron Taylor
81432100b8
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
2023-12-08 18:35:28 -05:00
EliteMasterEric
6060282f20
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2
2023-12-08 16:12:56 -05:00
EliteMasterEric
64cba7ca2d
Okay offsets should be actually done now.
2023-12-08 16:12:36 -05:00
EliteMasterEric
7c6baea7d2
Rework to fix variant issues
2023-12-08 14:01:12 -05:00
Cameron Taylor
2858cbf56b
mac file filter fix
2023-12-08 02:14:26 -05:00
Cameron Taylor
8f30532ed4
offsets null fix quick
2023-12-08 01:57:46 -05:00
Cameron Taylor
88409df992
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
2023-12-08 01:34:26 -05:00
EliteMasterEric
f3fa9a58d3
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2
2023-12-08 01:16:16 -05:00
EliteMasterEric
7f0caeb026
Work in progress on offsets in Chart Editor state.
2023-12-08 01:15:22 -05:00
Cameron Taylor
3652550b1a
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1
2023-12-07 18:14:10 -05:00
EliteMasterEric
e23c1464f6
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1
2023-12-07 16:32:12 -05:00
Cameron Taylor
cd0bd7ff55
assets
2023-12-07 14:41:53 -05:00
Cameron Taylor
554c7bb31d
null + macro things?
2023-12-07 14:29:45 -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
Cameron Taylor
a750cc1620
vis wips wips wips
2023-12-01 19:58:58 -05:00
EliteMasterEric
a0ae30a7c1
Metronome slider and scroll anchor
2023-12-01 17:14:48 -05:00
EliteMasterEric
8ef380e0b2
Resolve merge issues
2023-11-29 16:53:08 -05:00
EliteMasterEric
eebb2e874f
Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg
2023-11-29 16:42:40 -05:00
Cameron Taylor
df427c8ecb
player vis in progress
2023-11-29 06:17:01 -05:00
Cameron Taylor
eea614b4f5
samples stability
2023-11-29 05:49:59 -05:00
Cameron Taylor
73810a5059
Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform
2023-11-29 04:44:37 -05:00
Cameron Taylor
0899c60e8d
Merge pull request #234 from FunkinCrew/polish/welcome-screen
...
more info on playbar
2023-11-29 04:25:11 -05:00
Cameron Taylor
87b1cabbac
Merge branch 'rewrite/master' into bugfix/platform-fixes
2023-11-29 01:46:10 -05:00
Cameron Taylor
ca9f42fedf
waveform in progres
2023-11-29 01:43:59 -05:00
EliteMasterEric
99ed8b94d7
Target the current time change rather than the first one.
2023-11-28 21:44:09 -05:00
EliteMasterEric
90fc00f9bb
Additional web fixes, Github CI should be happy now.
2023-11-28 21:19:07 -05:00
EliteMasterEric
9a2f235bed
Platform-specific fixes for HTML5 and MacOS
2023-11-28 20:52:45 -05:00
EliteMasterEric
ed10d2c5d0
Multiple chart editor bug fixes +tweaks
2023-11-28 20:36:59 -05:00
Cameron Taylor
21b79c0b83
bpm in playbar
2023-11-28 04:30:29 -05:00
Cameron Taylor
d9d5744f1e
difficulty playbar
2023-11-28 04:05:17 -05:00
Cameron Taylor
aee8df4fcb
default note snapps
2023-11-27 23:29:48 -05:00
Cameron Taylor
e44559d056
last modified
2023-11-27 20:37:10 -05:00
Cameron Taylor
41384ddf0d
playtesting fix
2023-11-25 03:50:22 -05:00
Cameron Taylor
f3a38e0232
fixing the stop
2023-11-25 02:48:43 -05:00
Cameron Taylor
64a4512980
charting song polish + recents menu fix
2023-11-25 02:18:39 -05:00
EliteMasterEric
290c568cb5
Disable notification actions while playtest is open.
2023-11-24 16:11:53 -05:00
EliteMasterEric
a2cee82779
Fixing up a rough Git merge
2023-11-24 00:58:12 -05:00
EliteMasterEric
4e1945b373
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework
2023-11-24 00:49:51 -05:00
EliteMasterEric
47f39b072a
Convert chart editor to macro-based UIState
2023-11-24 00:42:07 -05:00
EliteMasterEric
bab7d6cf53
Reworks to dialogs
2023-11-24 00:41:38 -05:00
Cameron Taylor
811640ef6a
Merge branch 'rewrite/master' into feature/chart-editor-backup-popup
2023-11-23 20:08:13 -05:00
Cameron Taylor
a2ce1fdd5e
opening and selecting specific file
2023-11-23 19:54:34 -05:00
Cameron Taylor
2d33461a24
windows file slash fix for opening folders
2023-11-23 19:48:28 -05:00
Cameron Taylor
645b9b579a
don't close backup dialog if opening folder
2023-11-23 18:35:57 -05:00
Cameron Taylor
ecdb89c3a6
Merge pull request #228 from FunkinCrew/polish/chart-intro-screen
...
Polish/chart intro screen
2023-11-22 20:45:35 -05:00
Cameron Taylor
dbaaf639ac
Merge branch 'rewrite/master' into feature/chart-editor-backup-popup
2023-11-22 20:27:37 -05:00
EliteMasterEric
668fbd3b37
Fixes for autosave notification
2023-11-22 20:25:25 -05:00
Cameron Taylor
d66141c15a
playhead dragging
2023-11-22 19:53:56 -05:00
EliteMasterEric
4ace7c9cf4
Add "Go to Backups" menu item
2023-11-22 19:42:28 -05:00
EliteMasterEric
700ebb6a83
Add action buttons for notifications
2023-11-22 19:41:52 -05:00
EliteMasterEric
97b259d1c2
Finalized backup handling
2023-11-22 19:17:35 -05:00
EliteMasterEric
780220c2d4
Move notification handling into its own class.
2023-11-22 19:16:38 -05:00
Cameron Taylor
cdfb3fb172
dialog cursor fix
2023-11-21 18:45:31 -05:00
Cameron Taylor
63f65149f7
skip transition into chart editor
2023-11-21 16:09:13 -05:00
