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

2350 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric
eea8dde455 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:30:50 -05:00
Cameron Taylor
072cd2daf2 Merge pull request #307 from FunkinCrew/feature/dialogue-data-refactor 
Refactor dialogue data parsing
 2024-02-10 02:25:39 -05:00
Cameron Taylor
4bfab35b29 Merge branch 'rewrite/master' into feature/dialogue-data-refactor 2024-02-10 02:25:06 -05:00
Cameron Taylor
f12847dc59 assets submod 2024-02-10 02:23:58 -05:00
Cameron Taylor
ea76476ec2 Merge pull request #314 from FunkinCrew/bugfix/weekend-1-stuff 
Fix darnell's animations being flipped
 2024-02-10 02:18:10 -05:00
Cameron Taylor
2cc5d43896 Merge branch 'rewrite/master' into bugfix/weekend-1-stuff 2024-02-10 02:17:41 -05:00
Cameron Taylor
f3630dfff9 assets submod 2024-02-10 02:17:07 -05:00
EliteMasterEric
aaeea320e5 Fix darnell's animations being flipped 2024-02-10 00:51:53 -05:00
EliteMasterEric
bb0b176469 Fix bug with building specifically for freeplay. 2024-02-10 00:51:02 -05:00
EliteMasterEric
3ede16be16 Fix issue where Freeplay could be silent sometimes 2024-02-10 00:50:07 -05:00
Eric
aec42f783f Merge pull request #312 from FunkinCrew/weekend1/pico-retry-pos 
pico death retry position consistency fix
 2024-02-10 00:06:54 -05:00
EliteMasterEric
40603eaa06 Merge remote-tracking branch 'origin/rewrite/master' into weekend1/pico-retry-pos 2024-02-09 23:52:05 -05:00
Cameron Taylor
6b8c0637e3 pico death retry position fix 2024-02-09 23:36:01 -05:00
Eric
22c589764c Merge pull request #311 from FunkinCrew/wekend1/ez-fixies 
weekend 1 camera zoom
 2024-02-09 23:14:22 -05:00
Cameron Taylor
a50f27fe96 weekend 1 camera zoom 2024-02-09 23:03:09 -05:00
Cameron Taylor
f321c91078 Merge pull request #310 from FunkinCrew/feature/chart-editor-freeplay-preview 
Chart Editor: Freeplay Preview Toolbox
 2024-02-09 15:40:42 -05:00
EliteMasterEric
4bf9f68658 Finalize freeplay preview toolbox 2024-02-09 14:58:57 -05:00
EliteMasterEric
2d4ca436ec Update Polymod to drastically improve efficiency of openfl.utils.Assets.list() 2024-02-07 18:46:09 -05:00
EliteMasterEric
31cd5b3414 Rework Conversation data parsing 2024-02-07 18:45:13 -05:00
EliteMasterEric
fa556dc1f2 Rewrite conversation JSON parsing code. 2024-02-07 09:21:44 -05:00
Cameron Taylor
401c200070 Merge pull request #304 from FunkinCrew/feature/chart-editor-offset-toolbox 
Chart Editor: Offsets Toolbox
 2024-02-05 13:21:26 -05:00
Cameron Taylor
984c26c0e5 Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox 2024-02-05 13:06:25 -05:00
Cameron Taylor
bfd11ae097 Merge pull request #303 from FunkinCrew/bugfix/copy-prompt-fixes 
Copy command fixes
 2024-02-05 13:05:22 -05:00
Cameron Taylor
201e109d64 Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes 2024-02-05 13:03:32 -05:00
Cameron Taylor
6e2786ef52 Merge pull request #302 from FunkinCrew/feature/units 
Added units field to event properties
 2024-02-05 13:03:01 -05:00
Cameron Taylor
30cb53d8c2 haxeui-core update 2024-02-05 13:02:23 -05:00
Cameron Taylor
cc8b2b2d20 Merge branch 'rewrite/master' into feature/units 2024-02-05 11:55:52 -05:00
Eric
334d267ffc Merge pull request #306 from FunkinCrew/bugfix/metadata-crashfix 
Metadata toolbox crash fix
 2024-02-02 23:20:30 -05:00
EliteMasterEric
8e2c30720d Merge remote-tracking branch 'origin/rewrite/master' into bugfix/copy-prompt-fixes 2024-02-02 22:51:44 -05:00
EliteMasterEric
387ff4e816 Replace multiple conditions with array. 2024-02-02 22:38:34 -05:00
EliteMasterEric
65280c144c Merge branch 'feature/chart-editor-offset-toolbox' of https://github.com/FunkinCrew/Funkin-secret into feature/chart-editor-offset-toolbox 2024-02-02 22:28:47 -05:00
Eric
fecb4a5ad5 Merge branch 'rewrite/master' into feature/units 2024-02-02 22:06:49 -05:00
Eric
fc7244459e Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox 2024-02-02 22:03:57 -05:00
EliteMasterEric
8cef0c48d8 Update flixel-addons and assets submodule. 2024-02-02 22:03:32 -05:00
EliteMasterEric
f6f9ad3985 Completed functionality for offset window. 2024-02-02 21:53:45 -05:00
Jenny Crowe
fe7ffecc0d Chart editor: Tweaked FlxCamera management when entering and exiting playtest mode to fix UI-related crashes. 2024-02-01 13:52:50 -07:00
EliteMasterEric
f74604c48e Feature changes to Offsets window 2024-01-30 21:50:25 -05:00
EliteMasterEric
0f5be08c41 Add mute and max volume options to FunkinSound. 2024-01-30 21:49:49 -05:00
EliteMasterEric
c23ddb5c5a Fixes to the MeshRenderer 2024-01-30 21:49:34 -05:00
Hazel
d6bc8d88aa fix(ci): checkout, html5 (#305) 
* fetch-depth=1

* switch to app tokens

* docs?

* docs!

* actions / doesnt check out

* mac attempt 1

* custom setup haxe action

* trigger ci run thanks github

* interesting

* meow

* use tags

* homebrew fixing maybe

* mymindishazel/actions-setup-haxe@vC.1.8

* automationgit pushgit pushgit push

* rosetta all the way?

* macos oopsy

* mac cache && move ci to org

* update checkout action to do post-checkout cleaning

* update haxe & cache actions to node 20

* retry action but with updated ci-checkout@v6

* cleanup: there's no scheduled runs

* actions/cache@v4 in setup-haxe

* update to haxe 4.3

* lack of libc?

* ubuntu 23.10 has glibc 2.38

---------

Co-authored-by: Eric <ericmyllyoja@gmail.com>
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2024-01-29 14:50:04 -05:00
EliteMasterEric
f6e4bc863d Work in progress on offsets toolbox (working dragging!) 2024-01-27 03:24:49 -05:00
EliteMasterEric
8085b20a67 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offset-toolbox 2024-01-27 00:56:13 -05:00
Jenny Crowe
7137c13382 Copy command now pulses events in selection even if no notes are in the selection. "Copied" prompt now includes events in the text. 2024-01-26 19:36:10 -07:00
Jenny Crowe
4743076314 Added % as a unit to not include a space for when displaying in the event tooltip 2024-01-26 19:01:05 -07:00
Jenny Crowe
bfb032dc7f Added units to other song events. 2024-01-26 18:51:36 -07:00
Jenny Crowe
4f7c2cd511 Now using hbox to more easily append unit label 2024-01-26 18:30:41 -07:00
Jenny Crowe
8b19a7511c Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units 2024-01-26 18:20:04 -07:00
Jenny Crowe
8573a725bd acacagh assets update 2024-01-26 18:19:35 -07:00
Cameron Taylor
d039c20eef Merge pull request #301 from FunkinCrew/feature/audio-tab-upgrade 
Audio tab additions
 2024-01-25 23:06:21 -05:00
Cameron Taylor
ca739cee45 event.value -> event.value.toFloat() fix 2024-01-25 23:05:54 -05:00