Cameron Taylor
23051a5c60
Merge branch 'rewrite/master' into feature/2hot-cutscenes-eric
2024-04-21 17:26:55 -04:00
EliteMasterEric
d760a0d209
Add Ctrl-Alt-Shift-W as a debug hotkey to unlock all Darnell songs in Freeplay
2024-04-21 17:23:48 -04:00
Cameron Taylor
5063e747a1
Merge pull request #501 from FunkinCrew/bugfix/credits-ng-logo
...
Fix the animated NG logo overlapping the text in the credits
2024-04-21 17:20:55 -04:00
EliteMasterEric
4671a9172c
Fix the NG logo overlapping the text
2024-04-20 23:48:27 -04:00
EliteMasterEric
7f18eb62d7
Moved can explosion animation to weekend1 library so it's preloaded.
2024-04-20 23:04:08 -04:00
EliteMasterEric
84c3fd452b
Update Weekend 1 cutscenes to use the instanced Conductor
2024-04-20 02:11:04 -04:00
EliteMasterEric
a9dd85c865
Merge remote-tracking branch 'origin/feature/conductor-signal-rework' into feature/2hot-cutscenes
2024-04-19 18:49:18 -04:00
Cameron Taylor
678dbc0ab7
Merge branch 'rewrite/master' into a-bot-bars
2024-04-19 15:11:28 -04:00
Cameron Taylor
57df7db5f1
add small #if web define
2024-04-19 15:10:43 -04:00
Cameron Taylor
9500722a72
Merge branch 'rewrite/master' into polish/popup-combo-fixes-rebased
2024-04-19 15:00:37 -04:00
Cameron Taylor
49a81189c4
use funkinaction in controls.hx
2024-04-19 15:00:12 -04:00
FabsTheFabs
351cb8cbaa
popupstuff changes + make combopopup able to be edited outside of playstate
2024-04-19 14:14:33 -04:00
Cameron Taylor
5d8c28ca2b
Merge branch 'rewrite/master' into bugfix/blazin-death-confirm
2024-04-19 14:05:52 -04:00
Cameron Taylor
035db7f00a
Merge branch 'rewrite/master' into bugfix/draw-crash
2024-04-19 14:03:58 -04:00
Cameron Taylor
22e411d43f
Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support
2024-04-19 13:57:42 -04:00
Cameron Taylor
93ae7692c8
Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes
2024-04-19 13:55:01 -04:00
Cameron Taylor
1adef48995
some cleanins with letter sorts
2024-04-18 11:32:11 -04:00
Cameron Taylor
c3e777154e
fix letter sort regex, and tiny LetterSort.hx cleanin
2024-04-18 11:32:11 -04:00
Cameron Taylor
bb7b863272
Fix an issue where changing focus would pause some sounds but not others ( #491 )
...
Repro: Start a song then switch to another window. Instrumental and opponent pause but player doesn't.
2024-04-17 20:08:26 -04:00
Cameron Taylor
fd2356aed4
Fix a crash in the Results state. also nudge GF over to the spot shes in in the FLA ( #490 )
2024-04-17 20:07:47 -04:00
EliteMasterEric
b982484856
Properly fix the menu background to use the correct line colors.
2024-04-16 20:19:20 -04:00
Cameron Taylor
1405e21e3d
Merge branch 'rewrite/master' into a-bot-bars
2024-04-16 20:02:08 -04:00
EliteMasterEric
80a558ac08
Fix an issue where changing focus would pause some sounds but not others.
2024-04-16 19:57:19 -04:00
EliteMasterEric
d346c9387c
Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA
2024-04-16 19:42:52 -04:00
EliteMasterEric
bc0a27c985
Fix references to missing graphics in Freeplay
2024-04-16 18:43:11 -04:00
Cameron Taylor
2d5153cdbf
Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers
2024-04-16 13:33:02 -04:00
Cameron Taylor
fab6412bc6
Merge pull request #486 from FunkinCrew/bugfix/main-menu-color
...
Fix the saturation on the main menu background.
2024-04-16 13:25:46 -04:00
Cameron Taylor
e6dc795d2a
Merge branch 'rewrite/master' into bugfix/lingering-hold-cover
2024-04-16 13:25:00 -04:00
Eric
b553dbd517
Remove janky animation on Freeplay menu. ( #488 )
2024-04-16 13:24:41 -04:00
EliteMasterEric
43ec72fb9d
Ensure playNoteHoldCover doesn't call if note is judged as 'miss'
2024-04-15 20:36:38 -04:00
EliteMasterEric
4d1f60434a
Fix the saturation on the main menu background.
2024-04-15 19:21:55 -04:00
Cameron Taylor
bc0af9ae9f
temp enabling fps
2024-04-14 03:01:07 -04:00
Cameron Taylor
658fd392fa
Merge branch 'rewrite/master' into a-bot-bars
2024-04-14 02:57:05 -04:00
EliteMasterEric
5e7b417d6f
Remove Kickstarter link from credits.
2024-04-12 14:44:01 -04:00
EliteMasterEric
6f5c3a043f
Fix crash caused when game tries to render disposed sprites during a Sticker transition.
2024-04-10 14:45:07 -04:00
Cameron Taylor
5f48ca82bd
Merge branch 'rewrite/master' into bugfix/additional-fixins
2024-04-09 23:50:05 -04:00
Cameron Taylor
54496c400b
Merge pull request #479 from FunkinCrew/bugfix/no-save-data
...
Fix bad initial save data when no save data present
2024-04-09 23:34:28 -04:00
Cameron Taylor
0f9ecda2a1
Merge branch 'rewrite/master' into html5/asset-optimization
2024-04-09 20:25:37 -04:00
Cameron Taylor
f00c6085e4
Merge pull request #477 from FunkinCrew/bugfix/song-compile-define
...
Fix loading issue tied to -DSONG compile define.
2024-04-09 20:15:24 -04:00
EliteMasterEric
dbcbb73338
Main menu fix and Week 3 train fix
2024-04-09 15:10:58 -04:00
Mike Welsh
97884021c0
Fix bad initial save data when no save data present
...
If no save data was present, the game would check for legacy save
data in the ninjamuffin99 path to migrate over. This code was
incorrectly checking `FlxSave.data == null` to determine if
legacy data was present.
This caused an empty legacy save being migrated over, resulting
in a `volume` of 0 for any new player of the game.
2024-04-08 22:08:24 -07:00
EliteMasterEric
6d374c7af9
Fix loading issue tied to -DSONG compile define.
2024-04-08 18:39:51 -04:00
EliteMasterEric
b464f51ba2
Fix an issue where a missing stage would cause a crash (rather than an error popup)
2024-04-06 22:38:32 -04:00
EliteMasterEric
ea1d123c49
Fixes to Pico Blazin' animations.
2024-04-06 21:42:31 -04:00
EliteMasterEric
5beb20ec7c
Fix bug where restarting the song would sometimes crash.
2024-04-06 21:42:18 -04:00
EliteMasterEric
14869b9373
Also disable highscores in botplay
2024-04-06 02:08:10 -04:00
EliteMasterEric
99ee2b07ca
Make results screen use full campaign score in Story Mode
2024-04-06 02:06:06 -04:00
EliteMasterEric
29f105a44d
Practice mode = no highscore!
2024-04-06 01:59:46 -04:00
Cameron Taylor
3b87ecf6f5
Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization
2024-04-05 19:59:25 -04:00
Cameron Taylor
da4f1fb424
remove difficulty stars
2024-04-05 19:47:33 -04:00
EliteMasterEric
a6d44b1f15
Removed many unused assets to optimize bandwidth usage.
2024-04-05 19:43:52 -04:00
Cameron Taylor
90f53a78c1
Merge pull request #470 from FunkinCrew/bugfix/results-gf-cam-zoom
...
Readd GF camera zoom into results state.
2024-04-05 16:43:47 -04:00
Cameron Taylor
fe52fdfbad
assets submod
2024-04-05 16:40:37 -04:00
EliteMasterEric
95434018f7
Readd GF camera zoom into results state.
2024-04-05 02:56:47 -04:00
Eric
fd88ebef63
Merge pull request #467 from FunkinCrew/retro-fade
...
small fade polish for week 8 convos
2024-04-05 02:47:10 -04:00
EliteMasterEric
9c8ab72494
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes
2024-04-05 02:45:23 -04:00
EliteMasterEric
08e8530ad4
Fix SetCameraBopSongEvent to be additive
2024-04-05 02:44:44 -04:00
EliteMasterEric
a764112bd4
Removed many unused assets to optimize bandwidth usage.
2024-04-05 01:24:03 -04:00
EliteMasterEric
72a3742890
Fixes and improvements to LatencyState
2024-04-04 19:46:08 -04:00
EliteMasterEric
9a874d5293
Fix for weird HSV colors
2024-04-04 19:45:57 -04:00
EliteMasterEric
07092269b8
Merge branch 'rewrite/master' into input-offsets
2024-04-04 18:45:16 -04:00
EliteMasterEric
e35eb63d53
Merge branch 'rewrite/master' into hl-compiles
2024-04-04 18:16:07 -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
64cab4d137
removed duplicate merge
2024-04-04 05:37:48 -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
3cb1f65e1d
Merge pull request #465 from FunkinCrew/bugfix/miss-judgement
...
Hide miss popups when hitting ~160ms
2024-04-04 05:30:23 -04:00
Cameron Taylor
57a5973c2c
small fade polish for week 8 convos
2024-04-04 05:22:44 -04:00
Cameron Taylor
39d92eb09d
fast loading on preloader
2024-04-04 04:55:27 -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
99cdb62175
updated color
2024-04-04 04:46:38 -04:00
EliteMasterEric
33685b2bcd
Fix an issue where player could not switch difficulties from Pause menu until they beat Weekend 1.
2024-04-04 04:08:07 -04:00
Cameron Taylor
c23f97917c
Merge branch 'rewrite/master' into preloader-polish
2024-04-04 03:43:23 -04:00
EliteMasterEric
3ac466aa5e
Add missing MapTools function from #459
2024-04-04 03:35:36 -04:00
EliteMasterEric
8826d0741b
Hide miss popups when hitting ~160ms
2024-04-04 03:31:44 -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
d8903f138f
Additional save fix
2024-04-03 20:50:51 -04:00
EliteMasterEric
58427363d1
Prevent a crash trying to open a non-existant debugger checkbox.
2024-04-03 20:33:51 -04:00
EliteMasterEric
b39712d33f
Prevent crashes when the game attempts to load bad save data.
2024-04-03 20:31:34 -04:00
EliteMasterEric
4f2f28cb31
Fix issue with deepMerge() caused by handling maps incorrectly, causing an unhandleable crash.
2024-04-03 15:05:54 -04:00
EliteMasterEric
d911c46d2f
Better scoring numbers and improved anims.
2024-04-03 06:24:20 -04:00
EliteMasterEric
1759f5c388
Note cover now only plays splash on player
2024-04-03 04:52:28 -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
99e19f8460
Merge branch 'rewrite/master' into hl-compiles
2024-04-03 03:40:22 -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
165e20c318
Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes
...
Bugfix/judgements below notes
2024-04-01 22:08:00 -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
Cameron Taylor
bf9f87e9e7
Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note
...
Bugfix/spookeez hold note
2024-04-01 21:00:14 -04:00
EliteMasterEric
927b2a7cfc
Put judgements below the notes, and remove COMBO word.
2024-04-01 20:21:27 -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
ac5ca3991e
Merge branch 'rewrite/master' into feature/new-audio
2024-03-30 03:32:30 -04:00
Cameron Taylor
52c5f81e26
Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera
2024-03-30 03:24:46 -04:00
Cameron Taylor
32ed26ffa6
stereo preloader in progress
2024-03-29 17:54:20 -04:00
EliteMasterEric
28462681b2
Fix bug where 100ms sustains wouldn't update their rendering.
2024-03-29 00:52: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
Cameron Taylor
b75c7c2361
funkVis html5
2024-03-28 23:08:50 -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
8020624366
Fix a crash I found.
2024-03-28 21:40:16 -04:00
Jenny Crowe
e2851818b3
Zoom Camera: Property tweaks
2024-03-28 17:47:38 -07:00
EliteMasterEric
443a501e4e
Merge branch 'rewrite/master' into feature/freeplay-ost-text
2024-03-28 20:33:17 -04:00
Eric
0eddea9bf8
Merge branch 'rewrite/master' into bugfix/combo-fixes
2024-03-28 20:32:34 -04:00
EliteMasterEric
22f8d39ef1
Merge branch 'rewrite/master' into hl-compiles
2024-03-28 20:32:11 -04:00
Eric
7e96b02248
Merge branch 'rewrite/master' into feature/new-audio
2024-03-28 20:31:10 -04:00
EliteMasterEric
571c6d5960
Merge branch 'rewrite/master' into feature/credits
2024-03-28 20:29:15 -04:00
EliteMasterEric
9990cbbd27
Merge branch 'rewrite/master' into feature/conductor-signal-rework
2024-03-28 20:27:54 -04:00
Eric
5fa559dfb1
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
2024-03-28 20:26:45 -04:00
EliteMasterEric
e5a10c6a25
Merge branch 'rewrite/master' into a-bot-bars
2024-03-28 20:26:13 -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
Jenny Crowe
76885c421d
Cleanup + Focus Camera: Use Tween toggle converted to "Classic" ease type.
2024-03-28 12:34:13 -07:00
Jenny Crowe
d4c9fffe48
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into bugfix/quick-camera-fixes
2024-03-28 11:05:51 -07:00
Jenny Crowe
ef2cb4d9fc
Convert zoom modifiers from additive to multiplicative
2024-03-28 11:05:38 -07: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
3d14024fd8
Implement merch link.
2024-03-28 02:58:08 -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
837fcee983
Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit)
2024-03-28 00:19:57 -04:00
EliteMasterEric
c1c2621e1d
Fix bug where Bad and Shit didn't count at Notes Hit in the results screen.
2024-03-28 00:18:39 -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
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
