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

3480 commits

This branch
This branch
All branches
Author SHA1 Message Date
M&M
93b0fe153d Merge branch 'master' into resyncvocals 2021-02-12 23:21:51 -08:00
George FunBook
fb3ed180e1 Merge branch 'master' into deferred_loading 2021-02-12 09:46:22 -06:00
Cameron Taylor
b3ec450352 more seamless storymode transitions 2021-02-12 01:20:20 -05:00
Cameron Taylor
a037a52a60 Merge pull request #402 from TheDrawingCoder-Gamer/patch-1 
Use haxe switch case 'or'
 2021-02-11 22:14:24 -05:00
Cameron Taylor
1b0a62575e Update CHANGELOG.md 2021-02-11 22:07:04 -05:00
Cameron Taylor
af54d9c61c Merge pull request #382 from PrincessMtH/master 
BPM change functionality & implementation
 2021-02-11 22:05:30 -05:00
MtH
a8a3c96e7b entirely phase out totalBeats/totalSteps in favor of the more reliable curStep/curBeat 2021-02-12 03:19:43 +01:00
MtH
f3462c2c99 totalSteps & totalBeats synced with bpm changes 2021-02-12 01:58:11 +01:00
MtH
674a08b381 actually huge overhaul OOPS lol. 
trims off unnecessary data, supports bpm changes proper and according to my proposed system, also just happens to fix other issues with the chart editor
 2021-02-11 23:13:50 +01:00
MtH
41efd4f3db BPM map, trim off useless song stuff, adjust MILF cam zoom 2021-02-11 23:06:26 +01:00
Bulby
260a024e5c Use haxe switch case 'or' 2021-02-11 14:54:16 -05:00
George FunBook
755e338c88 Merge branch 'master' into deferred_loading 2021-02-11 13:18:50 -06:00
George FunBook
8dd68b6360 remove TitleState.soundExt 2021-02-11 13:14:16 -06:00
George FunBook
246c87240e fix preloaded versions 2021-02-11 13:14:02 -06:00
MtH
ad233110f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin 2021-02-11 11:09:23 +01:00
Cameron Taylor
f9b4e22ea0 Merge pull request #342 from regulad/remove-checkboxes 
Update Issue Templates
 2021-02-10 21:09:45 -05:00
George FunBook
0d16b0ad5c sections and stuff 2021-02-10 14:28:05 -06:00
George FunBook
225ee24fc3 move files to weeks and load songs individually 2021-02-10 14:18:14 -06:00
George FunBook
baab5f9749 move songs to song folder and create libraries for each week 2021-02-09 12:07:05 -06:00
George FunBook
b3ebc4365f move files to libraries 2021-02-08 20:43:17 -06:00
George FunBook
07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
M&M
646694bb79 Resync by music instead of vocals 2021-02-08 09:48:58 -08:00
MtH
8e251f5b4a tweak changeBPM functionality 2021-02-08 04:07:56 +01:00
M&M
8e0a286c01 Pause menu goes back to the mode you came from 2021-02-07 17:31:21 -08:00
Jan200101
d38323ab55 check if newgroups api key actually exists before creating core 2021-02-05 13:14:28 +01:00
Lotusotho
823acd7a60 Deleted bool I created before 2021-02-04 22:40:02 +01:00
Lotusotho
4e3a29943a Fixed bug at the start of the dialogue 2021-02-04 22:36:01 +01:00
Lotusotho
6552b2d132 Merge pull request #3 from ninjamuffin99/master 
merge changes 3
 2021-02-04 22:29:12 +01:00
regulad
1f8ac0d315 Update Issue Templates 
I had made some mistakes when I first submmited this PR as far as formatting and markdown goes.

Similar to #327.
 2021-02-03 10:51:52 -05:00
M&M
79e1925bf8 Add outline to score text 2021-02-02 23:44:35 -08:00
Cameron Taylor
7abd7c5c2e merge lol!! 2021-02-02 08:04:54 -05:00
Cameron Taylor
6301c7744f fix roses oopsies 2021-02-02 08:04:23 -05:00
Cameron Taylor
b8b5bb8888 RELEASE 2021-02-02 05:46:17 -05:00
Cameron Taylor
b0af2f6680 IM PISSED IM MAD BUT WE CLOSE 2021-02-02 04:54:36 -05:00
Cameron Taylor
518ee235d1 section shit 2021-02-02 04:13:28 -05:00
Cameron Taylor
cddb67d984 background girls 2021-02-02 03:24:34 -05:00
Cameron Taylor
60c4367896 lil dating sim things 2021-02-02 02:35:35 -05:00
Cameron Taylor
385097941c idk campaign menu shit 2021-02-02 02:20:14 -05:00
Cameron Taylor
c66eb94ccf THORNS AND EVIL MAN 2021-02-02 00:48:22 -05:00
Cameron Taylor
f306e603be aligned pixel arrows 2021-02-01 05:52:10 -05:00
Cameron Taylor
13ae7d65b6 FONT AND BULLSHIT 2021-02-01 01:50:30 -05:00
Cameron Taylor
5d0363ae96 call me senpai 2021-01-31 21:43:09 -05:00
Cameron Taylor
5ad361ecaa leaves lol! 2021-01-31 09:17:56 -05:00
Cameron Taylor
dac509b5a4 removed discord link lolol oops! 2021-01-30 23:54:28 -08:00
Cameron Taylor
224d8ea029 game over in progress 2021-01-30 07:16:51 -05:00
Cameron Taylor
c531aad3f6 senpai and roses on easy 2021-01-30 06:27:11 -05:00
Cameron Taylor
12f9cbe555 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-28 01:54:24 -05:00
Cameron Taylor
22b03ee420 bullshit 2021-01-28 01:54:21 -05:00
Cameron Taylor
85041ad157 Merge pull request #288 from PKPenguin321/controls-options 
Very rudimentary options UI for controls changes
 2021-01-28 01:51:58 -05:00
PKPenguin321
e8720332ec controls.txt and options UI 
very scuffed, OptionsMenu.hx is now mostly copied from FreeplayState.hx with no actual functionality
currently it reads lines off of controls.txt and displays them on Options menu which is now accessible from main menu
controls.txt has control functions prefixed with "set", IE "setUP", then the corresponding key on the following line IE "W"
 2021-01-27 00:58:58 -08:00