Eric
|
4856ea4435
|
Merge branch 'rewrite/master' into hxcodec-hmm
|
2024-04-29 22:12:41 -04:00 |
|
EliteMasterEric
|
3b1f84b4bd
|
Fixes to attract state.
|
2024-04-29 18:31:27 -04:00 |
|
EliteMasterEric
|
ea61c19aa5
|
Replace cutscenes.
|
2024-04-29 17:51:36 -04:00 |
|
Cameron Taylor
|
81f8338c99
|
sets the selected track as first one in group when swapping sorts on freeplay
|
2024-04-29 03:49:28 -04:00 |
|
Cameron Taylor
|
64b416e956
|
async the LoadingState asset preloads
|
2024-04-29 02:31:40 -04:00 |
|
FabsTheFabs
|
b35822f9a4
|
soundtray fade
|
2024-04-29 02:22:11 +01:00 |
|
EliteMasterEric
|
01b80ab5c8
|
Merge remote-tracking branch 'origin/input-offsets' into rewrite/master
|
2024-04-28 19:07:44 -04:00 |
|
Cameron Taylor
|
85350013d7
|
Merge pull request #511 from FunkinCrew/freeplay/cam-move
fix main menu -> freeplay camera positioning
|
2024-04-25 05:55:57 -04:00 |
|
Cameron Taylor
|
09ef915877
|
creds tweakin / polish
|
2024-04-25 05:45:27 -04:00 |
|
EliteMasterEric
|
85e06ef18f
|
Make it possible to escape the input offsets menu on controller.
|
2024-04-24 22:08:20 -04:00 |
|
EliteMasterEric
|
c3ba4081f1
|
Fix a crash issue caused when pressing a key after leaving the input offsets state.
|
2024-04-24 21:57:50 -04:00 |
|
EliteMasterEric
|
f474bc32a5
|
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
|
2024-04-24 21:54:45 -04:00 |
|
Cameron Taylor
|
1197f9646e
|
fix main menu -> freeplay camera positioning
|
2024-04-24 19:45:17 -04:00 |
|
EliteMasterEric
|
b6247c933a
|
Disable chart editor on web until it's fixed.
|
2024-04-24 16:00:50 -04:00 |
|
Cameron Taylor
|
e33f14ea5c
|
options screen menu bg fix
|
2024-04-24 12:11:37 -04:00 |
|
EliteMasterEric
|
3734c6ecd3
|
Make credits no longer pause and no longer autoformat. Add some names.
|
2024-04-24 01:48:39 -04:00 |
|
EliteMasterEric
|
374c042ad0
|
Fix a critical issue causing instrumental variations to not load on web.
|
2024-04-23 18:32:07 -04:00 |
|
Cameron Taylor
|
def8fc6977
|
Merge pull request #494 from FunkinCrew/freeplay-sorting-fixes
fix letter sort regex, and tiny LetterSort.hx cleanin
|
2024-04-23 04:52:40 -04:00 |
|
Cameron Taylor
|
6c63f84369
|
Merge branch 'rewrite/master' into bugfix/weekend-1-can-death-freeze
|
2024-04-23 04:14:41 -04:00 |
|
EliteMasterEric
|
66b45b526f
|
Fix issue where controller couldn't switch difficulties in Story Menu
|
2024-04-22 21:24:44 -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 |
|
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
|
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 |
|
EliteMasterEric
|
b982484856
|
Properly fix the menu background to use the correct line colors.
|
2024-04-16 20:19:20 -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 |
|
Eric
|
b553dbd517
|
Remove janky animation on Freeplay menu. (#488)
|
2024-04-16 13:24:41 -04:00 |
|
EliteMasterEric
|
4d1f60434a
|
Fix the saturation on the main menu background.
|
2024-04-15 19:21:55 -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
|
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 |
|
EliteMasterEric
|
6d374c7af9
|
Fix loading issue tied to -DSONG compile define.
|
2024-04-08 18:39:51 -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 |
|
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
|
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 |
|