cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-25 14:46:43 +00:00
Code Issues Releases Wiki Activity
3932 commits 31 branches 21 tags 3 GiB
Commit graph

3932 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
AppleHair 34a19ef583 [BUGFIX] Fixed cancelMenu sound not playing after switching state. 2024-07-10 18:08:55 -04:00
EliteMasterEric 242ab6e922 Add change counts labels to Actions labeler 2024-07-10 18:08:54 -04:00
Eric 87d8d4043e Make downloading the assets submodule a separate step. 2024-07-10 18:08:54 -04:00
Hundrec 9f17478a3a Add ZIP button warning and restructured sentences 
Each step should be easier to follow with this structure
 2024-07-10 18:08:54 -04:00
Hundrec 81680694e3 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 18:08:54 -04:00
EliteMasterEric d8572cd323 Thank you loggo 2024-07-10 14:23:50 -04:00
EliteMasterEric a93af43d63 Song title fixes. 2024-07-09 19:37:06 -04:00
EliteMasterEric ae03537676 Fix an issue with Pico's death animation spritesheet 2024-07-09 03:20:51 -04:00
Cameron Taylor 7a653707a8
Merge pull request #641 from FunkinCrew/maybemaru/pixels-per-ms 
[PUBLIC PR] Make use of Constants.PIXELS_PER_MS consistent.
 2024-07-08 22:12:18 -04:00
Cameron Taylor fdf52efdd1 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-07-08 22:10:52 -04:00
Cameron Taylor b4acfe8d95 assets submod 2024-07-08 22:10:40 -04:00
Cameron Taylor 51a156eec9 Merge branch 'char-select-cherrypick' into rewrite/master 2024-07-08 22:10:17 -04:00
Cameron Taylor d9d0facfca
Merge pull request #653 from FunkinCrew/feature/playable-pico-results 
Feature/playable pico results
 2024-07-08 21:52:23 -04:00
Cameron Taylor 6e5c6a8f6d assets submod 2024-07-08 21:51:44 -04:00
Cameron Taylor 96aa0b3a59 assets submod 2024-07-08 21:51:27 -04:00
Cameron Taylor b338dfe8f0
Merge pull request #649 from FunkinCrew/jvnpixels/story-menu-scrolling 
[PUBLIC PR] Scroll wheel in Story Menu
 2024-07-08 17:39:30 -04:00
Cameron Taylor 3a37b79a55 add TAB to controls stuff 2024-07-08 16:40:10 -04:00
Cameron Taylor 57c995e19d char select screen controls stuff 2024-07-08 16:30:17 -04:00
Cameron Taylor a92334d5ae Merge branch 'rewrite/master' into char-select-cherrypick 2024-07-08 16:23:32 -04:00
Cameron Taylor d7105e8b8e change debug menu and add key for freeplay 2024-07-08 16:22:38 -04:00
EliteMasterEric a9aa142b8d Added more pico results + charts 2024-07-07 04:10:37 -04:00
Cameron Taylor c9c94a5fda note fadein fix 2024-07-04 15:55:19 -04:00
Cameron Taylor 6593ddbbc8
Merge pull request #646 from FunkinCrew/gamerbross/playonce-returns 
[PUBLIC PR] FunkinSound.playOnce now returns the created sound
 2024-07-04 15:10:20 -04:00
Cameron Taylor 4d9b506380
Merge pull request #645 from FunkinCrew/gamerbross/char-danceevery 
[PUBLIC PR + CHANGES] Fix danceEvery for characters
 2024-07-04 15:08:51 -04:00
Cameron Taylor 214f68c4c1
Merge pull request #643 from FunkinCrew/feature/character-anim-fixes 
Enable GF combo animations, several character animation issues
 2024-07-04 15:07:25 -04:00
Cameron Taylor 67b1c3864e Merge branch 'rewrite/master' into feature/character-anim-fixes 2024-07-04 15:07:07 -04:00
Cameron Taylor 130440fd6e assets submod 2024-07-04 15:06:04 -04:00
Cameron Taylor eddfa23955
Merge pull request #644 from FunkinCrew/abnormalpoof/cutscene-auto-pause 
[PUBLIC PR] Automatically pause video cutscenes when tabbing away from the game
 2024-07-04 14:52:46 -04:00
Cameron Taylor 11eefc4f6d
Merge pull request #626 from FunkinCrew/feature/playable-pico-mode 
Playable Pico Mode
 2024-07-04 14:51:00 -04:00
Cameron Taylor 1eb12a3e3f assets submod 2024-07-04 14:49:35 -04:00
Cameron Taylor a7cfae8545 mer 2024-07-04 14:48:24 -04:00
EliteMasterEric 7fbc765403 Implement Pico results (good animation) 2024-07-04 03:32:50 -04:00
EliteMasterEric e32fcee77c Migrate results animations to JSON data so we can implement them per-character 2024-07-03 22:50:39 -04:00
AppleHair bd17d965f5 [BUGFIX] Fixed Ranks not appearing in freeplay for custom variations 
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
 2024-07-03 18:03:46 -04:00
EliteMasterEric ad57e64994 Working Pico DJ 2024-07-03 18:03:31 -04:00
EliteMasterEric 5c2bad888d Make Boyfriend DJ animations data driven 2024-07-03 18:02:16 -04:00
EliteMasterEric 72a00b9ae2 Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-07-03 18:01:49 -04:00
AppleHair b1021530d8 now using getVariationsByCharId instead 2024-07-03 18:00:59 -04:00
AppleHair 837efcea36 [BUGFIX] Made freeplay use the metadata to get the instrumental suffix 
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
 2024-07-03 18:00:58 -04:00
Cameron Taylor 105e3dccba spritesheet fixins for char select 2024-07-02 21:26:16 -04:00
FabsTheFabs 3fa9b2a635 new music 2024-07-01 22:18:04 -04:00
Cameron Taylor 8dfd36d227 menu spam fixie 2024-07-01 22:18:03 -04:00