Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity
3471 commits 30 branches 20 tags 3 GiB
Commit graph

1515 commits

Author SHA1 Message Date
EliteMasterEric
7ff37ae0c2 Fix a conflict between a shader variable name and a function on some graphics cards. 2024-05-07 14:22:22 -04:00
EliteMasterEric
a652bfe9f0 Fix an error related to an easter egg, plus some warnings. 2024-05-07 14:01:00 -04:00
Cameron Taylor
1aa53ee97b Merge branch 'story-mode-diff-position' into develop-0.3.2 2024-05-03 01:14:31 -04:00
Cameron Taylor
7efc633f45 Merge branch 'actual-merch-fix' into develop-0.3.2 2024-05-03 01:12:23 -04:00
Cameron Taylor
ae9a132ccd remove typing bit 2024-05-03 01:12:18 -04:00
EliteMasterEric
5e63832a87 Revert "Moved scroll speed to an instance variable" 
This reverts commit 6e5171b766.
 2024-05-02 23:06:01 -04:00
Cameron Taylor
6620b2e83c actual merch fix stuff 2024-05-02 23:02:47 -04:00
Cameron Taylor
a3969ad5c0 hardcode storymenu difficulties to avoid overlaps 2024-05-02 21:37:07 -04:00
EliteMasterEric
a2aa1bd84a Remove unused "typing" element. 2024-05-02 21:23:55 -04:00
EliteMasterEric
76b7baa44a Remove options from the debug menu 2024-05-02 20:06:08 -04:00
EliteMasterEric
f3ec29ea46 Polymod now properly accesses ZIP mods. 2024-05-02 12:46:51 -04:00
EliteMasterEric
a8a2dc83d3 Add a .visible attribute to story weeks. 2024-05-02 12:46:24 -04:00
EliteMasterEric
dc50a4ba5e Clean up log spam in the preloader. 2024-05-02 12:45:31 -04:00
EliteMasterEric
23a27dd36e Implement onSongLoaded script event (with access to notes and events) 2024-05-02 04:11:27 -04:00
EliteMasterEric
65854b2ca8 Fix an issue with animated health icons from mods. 2024-05-02 04:09:38 -04:00
EliteMasterEric
88c7ed7949 Fix substate lifecycle script events not dispatching. 2024-05-02 04:08:51 -04:00
EliteMasterEric
4d7f3a3643 Granted access to scripts to some otherwise blacklisted functions. 2024-05-02 04:08:32 -04:00
EliteMasterEric
75af1b3947 Add mod list to crash logs 2024-05-02 04:07:56 -04:00
EliteMasterEric
cf01157b39 Mid-song cutscenes should just do nothing after they are finished, 2024-05-02 03:39:18 -04:00
EliteMasterEric
b06a35ea2f Add , and . hotkeys to chart editor. 2024-05-02 03:38:27 -04:00
EliteMasterEric
656e5e7cf1 Blacklist more sensitive modules. 2024-05-02 02:49:55 -04:00
EliteMasterEric
244db84d61 Block people from doing SKETCHY SHIT in mods 2024-05-02 01:52:14 -04:00
EliteMasterEric
5ce9e98b15 Add an error handler to DebugBoundingState. 2024-05-02 00:32:40 -04:00
EliteMasterEric
6e5171b766 Moved scroll speed to an instance variable in PlayState (for da modders :P) 2024-05-01 22:39:13 -04:00
EliteMasterEric
1e5f90774c What if modded songs showed up in game with no extra work? 😳 2024-05-01 21:51:33 -04:00
Cameron Taylor
aaeb77a1f5 preventDefaultKeys for PreciseInputManager, and just use the FlxG.keys version 2024-05-01 17:23:22 -04:00
Cameron Taylor
0f6ee32d8f add saruky gf ringtone as easter egg 2024-05-01 16:23:02 -04:00
Cameron Taylor
05361af964 easter egg fix in progress 2024-05-01 15:54:44 -04:00
Cameron Taylor
192f1113b4 merch link freeplay fix 2024-05-01 15:22:20 -04:00
EliteMasterEric
bbccdfe3fb Fix issue when git status returns empty string. 2024-05-01 13:40:46 -04:00
EliteMasterEric
73baabfa82 Detect if your local Git has been modified and display it. 2024-05-01 13:29:54 -04:00
EliteMasterEric
afdd28dbe2 Automatically mark -release builds as not prototype. 2024-05-01 12:56:13 -04:00
EliteMasterEric
02cc41fc98 Catch a potential crash when retrieving the render method 2024-05-01 11:41:15 -04:00
EliteMasterEric
72c83e7eb0 Don't show an error dialog twice. 2024-05-01 11:40:51 -04:00
EliteMasterEric
776747c2d9 Git Commit macro now available in all builds. 2024-05-01 11:40:23 -04:00
EliteMasterEric
9ffbc8479c Fix for another reported crash 2024-04-30 23:59:25 -04:00
EliteMasterEric
079b1f327a Fix two crashes thanks to a crash report 2024-04-30 23:24:43 -04:00
EliteMasterEric
109a3f50fb Always fetch git hash while building and always display git hash in the logs. 2024-04-30 22:42:58 -04:00
Cameron Taylor
8a8872680a save 2024-04-30 20:52:02 -04:00
EliteMasterEric
06ce5eb44b Potential save fix 2024-04-30 20:15:23 -04:00
Cameron Taylor
f5cbfbf631 more save fixes 2024-04-30 20:03:24 -04:00
Cameron Taylor
8ac59d80ec save file fixins in progress 2024-04-30 19:54:55 -04:00
Cameron Taylor
36ab5d441c save file nullcheck 2024-04-30 19:30:11 -04:00
EliteMasterEric
9030b165df Final attract screen 2024-04-30 19:01:39 -04:00
Cameron Taylor
7986dbe2a0 revert mainmenu persistentUpdate chagne 2024-04-30 16:30:22 -04:00
EliteMasterEric
11c0249f42 Fix an issue with Freeplay sorting when leaving an Erect song. 2024-04-30 14:36:57 -04:00
EliteMasterEric
e7a09fcee2 Fix an issue where returning to Freeplay from gameplay would let you interact with the menu underneath 2024-04-30 13:58:39 -04:00
EliteMasterEric
dae7d71b17 Better (but not perfect) results screen text alignment 2024-04-30 13:34:34 -04:00
Cameron Taylor
80a881a5ce autoPause save fix 2024-04-30 08:13:39 -04:00
Cameron Taylor
aff9ee5312 volume preference fix 2024-04-30 07:54:42 -04:00
Cameron Taylor
23dd9937ec black camera bg 2024-04-30 07:21:45 -04:00
Cameron Taylor
45941af161 Merge branch 'rewrite/master' into freeplay-objects-tweens 2024-04-30 04:15:22 -04:00
Cameron Taylor
c0ae253c40 Merge branch 'rewrite/master' into preloader-fnf-spacing 2024-04-30 04:15:00 -04:00
Cameron Taylor
61012fab68 dad art tween and shader on ost text 2024-04-30 03:22:30 -04:00
Cameron Taylor
84668432ba better tween in for bg dad art 2024-04-30 01:38:00 -04:00
Cameron Taylor
b12d86c959 completion number and box fadeout 2024-04-30 01:33:29 -04:00
Cameron Taylor
0c72f0f5a2 fix spacing on the fnf text on the preloader 2024-04-30 01:09:40 -04:00
Cameron Taylor
ce24ad1a8a add fullscreen rebindable keybind across whole game 2024-04-30 00:40:42 -04:00
Cameron Taylor
7610fb4205 Merge pull request #528 from FunkinCrew/main-menu-cam 
persistentUpdate true main menu
 2024-04-30 00:19:28 -04:00
Cameron Taylor
bd551092dc persistentUpdate true main menu 2024-04-29 23:31:55 -04:00
Cameron Taylor
e1327f1b2c remove filter from touch here to play, and make it more responsive to input 2024-04-29 23:00:39 -04:00
Cameron Taylor
12f5904aa5 Merge branch 'rewrite/master' into cutscene-updates 2024-04-29 22:21:06 -04:00
Eric
4856ea4435 Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 22:12:41 -04:00
EliteMasterEric
dbae4aff8f Fix crash when initializing screenshots when there is no save data 2024-04-29 19:28:47 -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
Eric
c8dcda89a1 Merge branch 'rewrite/master' into freeplay-no-randoms 2024-04-29 15:55:52 -04:00
Eric
9599536ffc Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 15:55:45 -04:00
Hazel
3a7efeeca3 fix(ci): linux private repo issues (#524) 2024-04-29 20:04:01 +01: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
c609e3591b fixed classic camera reset 2024-04-29 02:22:33 +01:00
FabsTheFabs
b35822f9a4 soundtray fade 2024-04-29 02:22:11 +01:00
FabsTheFabs
3083305f51 fix pixel combo numbers being huge 2024-04-29 02:21:44 +01:00
EliteMasterEric
01b80ab5c8 Merge remote-tracking branch 'origin/input-offsets' into rewrite/master 2024-04-28 19:07:44 -04:00
Cameron Taylor
0f84050957 Merge pull request #515 from FunkinCrew/debug-stuff 
homemade flixel tracker button
 2024-04-28 02:45:28 -04:00
Cameron Taylor
46dcd4c8ea homemade flixel tracker button 2024-04-27 01:17:15 -04:00
Cameron Taylor
99934c8039 change the initial animation frame for abot 2024-04-26 23:48:17 -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
Cameron Taylor
7d2713a731 this doesn't need to be here 2024-04-25 01:55:51 -04:00
Cameron Taylor
12b5d6d086 some result screen polish 2024-04-25 01:53:13 -04:00
EliteMasterEric
dd90d430ee Replace the zoom with a fade (for now) 2024-04-24 23:50:19 -04:00
EliteMasterEric
7c6bf7ef45 Fix the alignment of the song name in the results screen 2024-04-24 23:50:11 -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
e0721b901e Fix a bug where negative visual offsets would break the countdown. 2024-04-24 21:57:23 -04:00
EliteMasterEric
17a15a3947 Reposition notes based on the configured input offset (so you still hit them when centered) 2024-04-24 21:57:17 -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
5aba4008ac Merge branch 'feature/2hot-cutscenes-eric' into bugfix/weekend-1-can-death-freeze 2024-04-23 04:20:28 -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
1e5153f133 Fix an issue where zooming in the camera would persist to results screen 2024-04-22 23:04:57 -04:00
EliteMasterEric
6edd9e8c6a Make cars stop moving while the game is paused. 2024-04-22 22:30:29 -04:00
EliteMasterEric
66b45b526f Fix issue where controller couldn't switch difficulties in Story Menu 2024-04-22 21:24:44 -04:00