gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,333 Commits 1 Branch 38 Tags
ee906ae8c0086b6ba3e49b94de128308ed63b2d9
Commit Graph
5333 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
anysadandEliteMasterEric 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 TaylorandGitHub 5a26ece9d6 Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Cameron TaylorandGitHub 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 TaylorandGitHub d423753de0 Merge branch 'rewrite/master' into flooferland/new-settings-types 2024-07-11 19:48:51 -04:00
Cameron TaylorandGitHub 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
EricGitHubKarim Akra
 		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
EricGitHubCameron Taylor
 		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 TaylorandGitHub 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 TaylorandGitHub 93148e97e8 Merge pull request #658 from FunkinCrew/bugfix/song-title-fixes 
Song title fixes.
 2024-07-11 18:37:31 -04:00
Cameron TaylorandGitHub 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 TaylorandGitHub 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
anysad 47a2cf4e5d Add HEY! song events to Tutorial 2024-07-11 18:12:50 +03:00
anysad a12b0e6ec3 Add HEY! song events to Tutorial 2024-07-11 18:10:45 +03:00
lemzandGitHub 2be22055cc Merge branch 'develop' into fps-setting 2024-07-11 10:25:16 +02:00
EricandGitHub 1a44853c88 Merge pull request #2452 from eltociear/patch-1 
Update ScriptEventType.hx
 2024-07-11 03:56:07 -04:00
EricandGitHub 9b483de1da Merge pull request #3003 from Hundrec/issue-templates 
New Issue and PR templates tweaks
 2024-07-11 03:49:11 -04:00
gamerbrossandEliteMasterEric 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
HundrecandEliteMasterEric 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
HundrecandEliteMasterEric 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
gamerbross 2fb55ba3ed Fix default health icon not used 2024-07-11 06:59:22 +02:00
HundrecandGitHub 25a90d8419 Reword in crash report 2024-07-10 20:33:12 -07:00
HundrecandGitHub 6698ee6770 . 2024-07-10 20:31:06 -07:00
HundrecandGitHub ffadce45e0 More crash report tweaks 2024-07-10 18:50:12 -07:00
HundrecandGitHub ca5e08f967 Specify crash log location 2024-07-10 18:47:34 -07:00
HundrecandGitHub 0f35618a15 PR template tweak 2024-07-10 18:43:15 -07:00
HundrecandGitHub ce24a6f7a3 Tweak Enhancement Template 2024-07-10 18:42:25 -07:00
HundrecandGitHub ac11e5238d Tweak Crash Report Template 2024-07-10 18:40:38 -07:00
HundrecandGitHub 88b35ce8c2 Tweak Bug Report Template 2024-07-10 18:37:19 -07:00
HundrecandGitHub 7353747ca5 Simplify PR template 2024-07-10 18:25:32 -07:00
HundrecandGitHub fd37e2121c PR template rename 2024-07-10 18:13:27 -07:00
EricandGitHub 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
tposejank 738a21eeb6 abcd 2024-07-10 20:41:40 -04:00
tposejank a27e743c5f Merge remote-tracking branch 'upstream/main' into better-templates 2024-07-10 20:37:31 -04:00
EricandGitHub dd763c4b64 Merge pull request #2996 from Hundrec/issue-templates 
[DOCS] Automatically assign 'status: pending triage' label to all new issues
 2024-07-10 20:21:49 -04:00
gamerbrossandEliteMasterEric 8107d1a290 Remove SustainTrail forced alpha 2024-07-10 20:18:29 -04:00
EliteMasterEric 49b7876b5a Add change counts labels to Actions labeler 2024-07-10 20:18:28 -04:00
Eric abf898ff01 Make downloading the assets submodule a separate step. 2024-07-10 20:18:28 -04:00
HundrecandEliteMasterEric 33bfe34f09 Add ZIP button warning and restructured sentences 
Each step should be easier to follow with this structure
 2024-07-10 20:18:28 -04:00
HundrecandEliteMasterEric 2d5be92882 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-10 20:18:28 -04:00