cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-12 08:25:13 +00:00
Code Issues Releases Wiki Activity
2757 commits 30 branches 20 tags 3 GiB
Commit graph

2757 commits

This branch
This branch
All branches
Author SHA1 Message Date
FabsTheFabs 607b5757fd added decimal point to waveform duration 2024-03-06 05:05:03 +00:00
Cameron Taylor c98870e923 Merge pull request #367 from FunkinCrew/feature/script-event-note-incoming 
Implement onNoteIncoming script event.
 2024-03-06 00:04:21 -05: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
Cameron Taylor 6540d4acfa Merge pull request #368 from FunkinCrew/feature/chart-editor-bot-play 
Implement a Bot Play checkbox in the chart editor
 2024-03-05 23:54:08 -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 67788d762d Merge pull request #366 from FunkinCrew/jenny-assets 
jenny assets submod
 2024-03-05 20:09:15 -05:00
Cameron Taylor 6db5d10a55 jenny assets submod 2024-03-05 19:35:51 -05:00
Cameron Taylor fb0386812c Merge pull request #365 from FunkinCrew/bugfix/2hot-explosion-polymod 
Bugfix/2hot explosion polymod
 2024-03-05 14:38:17 -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
Cameron Taylor 95138d0386 Merge pull request #363 from FunkinCrew/bugfix/chart-editor-vocal-crash 
Fix a bug where Chart Editor Playtest destroys the vocals and crashes
 2024-03-05 14:35:15 -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
Eric c6ad7f365f Merge pull request #330 from FunkinCrew/bugfix/audio-focus 
Fix `FunkinSound` not resuming after focus
 2024-03-04 22:57:39 -05: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
Eric d98d070f13 Merge pull request #362 from FunkinCrew/result-screen-fixes 
Tallies calculate when playing story mode
 2024-03-04 22:45:25 -05:00
EliteMasterEric 07524c8ee8 Eric's modifications to checkstyle.json 2024-03-04 22:42:02 -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 1f1ccf6256 Merge pull request #361 from FunkinCrew/feature/philly-cars 
Cars on Weekend 1 Stage
 2024-03-04 18:19:16 -05:00
Cameron Taylor 078dc8e9ee assets submod 2024-03-04 18:15:01 -05:00
Cameron Taylor f661e36fbb Merge pull request #360 from FunkinCrew/feature/blazin-animation-work 
Week of Feb 26: Blazin' Animation Work
 2024-03-04 18:11:36 -05:00
Cameron Taylor ae7d8b9046 Merge branch 'rewrite/master' into feature/blazin-animation-work 2024-03-04 18:11:11 -05:00
Cameron Taylor 37d2d4eb4d assets submod 2024-03-04 18:10:30 -05:00
FabsTheFabs 8ddf1ceb23 Update assets 2024-03-04 22:33:51 +00:00
EliteMasterEric 72044c572b Update assets 2024-03-04 17:25:16 -05:00
EliteMasterEric 02cb4b5002 Update assets 2024-03-04 16:42:20 -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
Cameron Taylor 39fcf45747 Merge pull request #358 from FunkinCrew/feature/rain 
Re-enable rain on phillyStreets
 2024-03-04 16:17:36 -05:00
Cameron Taylor 4c8b0885cd Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/rain 2024-03-04 16:15:33 -05:00
Cameron Taylor bb7ed6d85c Merge pull request #359 from FunkinCrew/bugfix/fadeTween 
Avoid null reference error with music
 2024-03-04 16:09:32 -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
Mike Welsh bdb0fe6b51 Bump assets submodule 2024-03-04 02:14:18 -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
EliteMasterEric c36ea962dc Update assets submodule 2024-03-03 01:40:58 -05: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