cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-09 00:04:42 +00:00
Code Issues Releases Wiki Activity
2999 commits 3 branches 3 tags 3 GiB
Commit graph

2115 commits

Author SHA1 Message Date
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 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
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
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 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
EliteMasterEric 42eec66753 Rework HTML5 video cutscenes to properly support the pause menu and volume controls. 2024-03-19 15:56:00 -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
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
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
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