cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity
4029 commits 30 branches 20 tags 6.8 GiB
Commit graph

4029 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor f90c2bda99
Merge branch 'rewrite/master' into anysad/tutorial-hey-events 2024-07-18 15:08:10 -04:00
Cameron Taylor b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
 2024-07-18 15:07:52 -04:00
Cameron Taylor 8d9071d4fd
Merge pull request #669 from FunkinCrew/gamerbross/pause-sticker-zoom 
[PUBLIC PR] Fix a bug where pausing during a camera zoom would break the HUD funk-612
 2024-07-18 15:00:09 -04:00
Cameron Taylor e26a99d128
Merge pull request #668 from FunkinCrew/gamerbross/chart-editor-live-inputs 
[PUBLIC PR] Cleanup chart editor live inputs
 2024-07-18 14:56:41 -04:00
Cameron Taylor d7794374d9
Merge branch 'rewrite/master' into gamerbross/chart-editor-live-inputs 2024-07-15 12:53:59 -04:00
Cameron Taylor b6a8b62950
Merge branch 'rewrite/master' into gamerbross/pause-sticker-zoom 2024-07-15 12:53:50 -04:00
Cameron Taylor 6f66488a04
Merge pull request #665 from FunkinCrew/public-release/develop 
Documentation changes from `public/develop`
 2024-07-15 12:49:48 -04:00
gamerbross e6c9767800 Revert camCutscene rename 2024-07-11 22:48:21 -04:00
gamerbross e23e6c160d Fix references to camCutscene 2024-07-11 22:48:20 -04:00
gamerbross 17f5a06256 Add camOther to fix zooms on pause and stickers 2024-07-11 22:48:20 -04:00
gamerbross 90155bcfbf ChartEditor Live Input Code Refactor + 6 key fix 2024-07-11 22:24:38 -04:00
EliteMasterEric 4a7545a0db Remove empty function. 2024-07-11 21:45:06 -04:00
anysad 305ab3146f Add HEY! song events to Tutorial 2024-07-11 21:42:24 -04:00
anysad 18b795d4f7 Add HEY! song events to Tutorial 2024-07-11 21:39:20 -04:00
EliteMasterEric 50b587e3b8 Merge remote-tracking branch 'public/develop' into rewrite/master 2024-07-11 20:58:42 -04:00
EliteMasterEric 3721fb688f Merge branch 'main' into develop 2024-07-11 20:38:45 -04:00
Cameron Taylor 5a26ece9d6
Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Cameron Taylor 7cd19a0135
Merge pull request #656 from FunkinCrew/feature/nene-combo-anims 
Implement combo animations for Nene + other changes
 2024-07-11 19:52:01 -04:00
Cameron Taylor 966fce3426 Merge branch 'rewrite/master' into feature/nene-combo-anims 2024-07-11 19:51:13 -04:00
Cameron Taylor 261d68c410 assets submod 2024-07-11 19:51:00 -04:00
Cameron Taylor cffe41985d
Merge pull request #663 from FunkinCrew/gamerbross/hold-note-forced-alpha 
[PUBLIC PR] Fix a bug where mods can't change the transparency of hold notes
 2024-07-11 19:48:35 -04:00
Cameron Taylor 068a660a91 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-07-11 19:46:40 -04:00
Cameron Taylor 19fd8b5e4e Merge branch 'gamerbross/chart-editor-key' into rewrite/master 2024-07-11 19:45:10 -04:00
Eric 71947c581e
[PUBLIC PR] Fix a bug where the memory counter would overflow into the negatives (#662) 
* get Float instead of Int in cpp (Float is 64-bit in so it works easier than Int64)

* use Math.fround instead of Math.round

---------

Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>
 2024-07-11 19:35:41 -04:00
Eric 66b103c650
[PUBLIC PR] Remove 5 duplicate audio files from the DadBattle folder. (#657) 
* Remove 5 duplicate audio files from the DadBattle folder.

* assets submod merge

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2024-07-11 19:34:34 -04:00
Cameron Taylor 411484351a
Merge pull request #655 from FunkinCrew/doggogit/pico-death-fix 
[PUBLIC PR] Fix an issue with Pico's death animation spritesheet
 2024-07-11 18:39:23 -04:00
Cameron Taylor ddec0070e3 Merge branch 'rewrite/master' into doggogit/pico-death-fix 2024-07-11 18:39:04 -04:00
Cameron Taylor cfb2cf36de assets submod merge 2024-07-11 18:38:29 -04:00
Cameron Taylor 93148e97e8
Merge pull request #658 from FunkinCrew/bugfix/song-title-fixes 
Song title fixes.
 2024-07-11 18:37:31 -04:00
Cameron Taylor dd3f41ab1b
Merge pull request #659 from FunkinCrew/feature/commas-in-score 
Add commas to the score to make it more readable
 2024-07-11 18:36:35 -04:00
Cameron Taylor 69859b80ee
Merge pull request #661 from FunkinCrew/applehair/menu-back-sounds 
[PUBLIC PR] Fixed back sound not playing in Story and Options menus
 2024-07-11 18:36:23 -04:00
Eric 1a44853c88
Merge pull request #2452 from eltociear/patch-1 
Update ScriptEventType.hx
 2024-07-11 03:56:07 -04:00
Eric 9b483de1da
Merge pull request #3003 from Hundrec/issue-templates 
New Issue and PR templates tweaks
 2024-07-11 03:49:11 -04:00
gamerbross 7b9e4a0542 Fix F5 chart not reloading 2024-07-11 03:41:51 -04:00
EliteMasterEric 3f63bc35a4 Add change counts labels to Actions labeler 2024-07-11 03:41:51 -04:00
Eric 6e65996180 Make downloading the assets submodule a separate step. 2024-07-11 03:41:50 -04:00
Hundrec 562136ed55 Add ZIP button warning and restructured sentences 
Each step should be easier to follow with this structure
 2024-07-11 03:41:50 -04:00
Hundrec 4044a7d936 Reorder download Git step in compiling guide 
Moved “download Git” from the middle of the guide to the setup step
Should prevent errors with Git before installing Git
 2024-07-11 03:41:50 -04:00
Hundrec 25a90d8419
Reword in crash report 2024-07-10 20:33:12 -07:00
Hundrec 6698ee6770
. 2024-07-10 20:31:06 -07:00
Hundrec ffadce45e0
More crash report tweaks 2024-07-10 18:50:12 -07:00
Hundrec ca5e08f967
Specify crash log location 2024-07-10 18:47:34 -07:00
Hundrec 0f35618a15
PR template tweak 2024-07-10 18:43:15 -07:00
Hundrec ce24a6f7a3
Tweak Enhancement Template 2024-07-10 18:42:25 -07:00
Hundrec ac11e5238d
Tweak Crash Report Template 2024-07-10 18:40:38 -07:00
Hundrec 88b35ce8c2
Tweak Bug Report Template 2024-07-10 18:37:19 -07:00
Hundrec 7353747ca5
Simplify PR template 2024-07-10 18:25:32 -07:00
Hundrec fd37e2121c
PR template rename 2024-07-10 18:13:27 -07:00
Eric 712792c385
Merge pull request #2717 from tposejank/better-templates 
[FEATURE] Better issue and pull request templates
 2024-07-10 20:48:10 -04:00
tposejank 2915fd7717 efgh 2024-07-10 20:42:08 -04:00