cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-10 08:44:47 +00:00
Code Issues Releases Wiki Activity
2821 commits 3 branches 3 tags 3 GiB
Commit graph

278 commits

Author SHA1 Message Date
EliteMasterEric 979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
EliteMasterEric c0745d4ad7 Hide warning 2023-07-31 14:08:48 -04:00
EliteMasterEric 4e67791249 Vwoosh notes on reset 2023-07-31 13:42:13 -04:00
EliteMasterEric 92a0c367b7 Typo fixes 2023-07-31 13:31:17 -04:00
EliteMasterEric d0ef34ced6 Merge branch 'master' into feature/new-input-system-yay 2023-07-26 22:00:14 -04:00
EliteMasterEric b974e6d6d7 Fix issues with playtest and backwards time travel 2023-07-26 21:34:38 -04:00
EliteMasterEric 03444161e8 Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview 2023-07-26 20:03:37 -04:00
EliteMasterEric 2048e65bf2 Added ability to start song at a specific timestamp 2023-07-26 20:03:31 -04:00
EliteMasterEric 5ff546bacc First iteration of song playtesting from editor! 2023-07-26 16:52:58 -04:00
EliteMasterEric 6af5259a10 Fix an issue where sustain sprites were not killed when the song was reset. 2023-07-25 21:39:19 -04:00
EliteMasterEric 3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
EliteMasterEric aaad06c97d Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm 2023-07-19 21:19:21 -04:00
EliteMasterEric 16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -04:00
EliteMasterEric 70584c6e88 Make funkin.util.Constants auto-imported 2023-07-13 01:13:26 -04:00
EliteMasterEric 796a51325f Hold note covers are in and properly positioned 2023-07-08 01:03:46 -04:00
EliteMasterEric 54a9b09155 Merge branch 'master' into bugfix/conductor-monster 2023-07-06 12:35:49 -04:00
EliteMasterEric 8e071221ff Work in progress on hold covers 2023-07-05 22:11:58 -04:00
EliteMasterEric b615fbf82a WIP on hold covers 2023-07-04 16:38:10 -04:00
EliteMasterEric bb8b0b59b1 Video cutscenes in Week 7 no longer broken 2023-07-02 16:46:40 -04:00
EliteMasterEric cddc50bbe5 Rework quickWatch 2023-07-02 16:17:04 -04:00
EliteMasterEric 8685054696 Freaky Menu uses metadata.json for BPM data. 2023-07-02 15:34:34 -04:00
EliteMasterEric 085d7aaa9d Fix for note splashes 2023-06-27 21:29:50 -04:00
EliteMasterEric d91c341bd2 Fixed a bug where you could hold notes forever 2023-06-27 18:06:33 -04:00
EliteMasterEric 2f7708c106 Hold notes pretty much done! yay! 2023-06-27 17:22:51 -04:00
EliteMasterEric a672db7b0e Messing around with logic for hold note misses/health gain 2023-06-27 13:43:42 -04:00
EliteMasterEric 47d8d9e4db Work in progress on redoing hold note rendering 2023-06-26 20:40:26 -04:00
EliteMasterEric 2cae781984 Sustains are kinda working? 2023-06-22 19:28:39 -04:00
EliteMasterEric 25c70564bd WIP on new note rendering, inputs. 2023-06-22 01:41:01 -04:00
EliteMasterEric 28ddadffff Week 6 dialogue support + bug fixes 2023-06-16 17:37:56 -04:00
EliteMasterEric 3d8dd8d604 More conductor rework changes 2023-06-15 00:29:40 -04:00
EliteMasterEric b783271451 ComboCounter->ComboMilestone 2023-06-15 00:11:20 -04:00
Cameron Taylor b564ad087b vocals fix... lol! 2023-06-13 01:04:29 -04:00
EliteMasterEric 2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
EliteMasterEric e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric 1d3c4d61a6 Syntax fixes to get the branch to build 2023-06-06 17:38:31 -04:00
EliteMasterEric 9f8d1dbac2 Playstate fixes WIP (TODO: fix compile errors) 2023-06-02 15:35:01 -04:00
EliteMasterEric 4d539fdda2 Substate -> SubState (capitalization fix) 2023-06-01 18:52:58 -04:00
EliteMasterEric 09318c258b Remove old story menu state 2023-06-01 15:59:56 -04:00
EliteMasterEric dc932eb8d7 A few bug fixes related to vocal tracks 2023-05-25 19:36:32 -04:00
EliteMasterEric 2af4a51b15 Merge branch 'master' into feature/split-vocals 2023-05-25 18:39:41 -04:00
EliteMasterEric 2f10de3594 New refactor to VoicesGroup to make multiple vocal tracks actually work 2023-05-25 18:34:26 -04:00
EliteMasterEric a599dbea11 Reworked Story Menu (data driven) 2023-05-17 16:42:58 -04:00
Cameron Taylor 03f48289e1 Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent 
Fixed an issue where SongEventScriptEvent would not be dispatched
 2023-04-20 16:56:05 -04:00
EliteMasterEric 337802a6bf Fixed an issue where SongEventScriptEvent would not be dispatched 2023-04-20 13:48:15 -04:00
Cameron Taylor 1a5b68acd8 substate loading type beat 2023-04-05 00:56:02 -04:00
Ravy c68ed233f9 make game use rfc format for spitting inputs 2023-03-18 19:47:23 +00:00
Cameron Taylor f32330914e score fix for ravy teehe 2023-03-09 12:39:56 -05:00
Cameron Taylor f9a7e309fb score change 2023-03-02 04:20:03 -05:00
Cameron Taylor 9ff3d4355d Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2023-02-22 15:01:07 -05:00
Cameron Taylor dd73539294 inputSpitter for ravy 2023-02-22 14:46:46 -05:00
EliteMasterEric e035adab72 Merge branch 'feature/flxanimate' 2023-02-21 21:01:22 -05:00
EliteMasterEric cdd8cd2ed2 Basic working tankman sprites and cutscenes 2023-02-21 20:58:15 -05:00
Cameron Taylor 0f9d0a6c98 stage editor in progress 2023-01-27 02:38:37 -05:00
EliteMasterEric 634258535c Applied new code style to source/ and assets/data/ 2023-01-22 22:25:45 -05:00
EliteMasterEric 6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00
EliteMasterEric 7f9171203a Merge branch 'feature/2-chart-2-editor' 2023-01-02 17:43:19 -05:00
EliteMasterEric 6d233b93e0 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2023-01-02 17:41:19 -05:00
EliteMasterEric 6b3c15348b Autosave and save-on-quit for chart editor 2023-01-02 17:40:53 -05:00
Cameron Taylor e1f53d288d freeplay highscore stuff 2022-12-16 17:10:22 -05:00
Eric Myllyoja 9db6f7f32a Merge remote-tracking branch 'origin/feature/week-4-gameplay' 2022-12-08 19:52:09 -05:00
Eric Myllyoja 19b2f3799a Chart wizard plus shader fixes 2022-12-08 19:33:47 -05:00
Eric Myllyoja 7190a3b47a Pico flips you off now 2022-11-14 23:30:35 -05:00
Eric Myllyoja 709cfab6a7 Merge branch 'feature/chart-editor' 2022-10-27 09:37:13 -04:00
Eric Myllyoja 6e8feecef1 Many improvements to chart system and song format logic 2022-10-26 01:14:29 -04:00
Eric Myllyoja 36a49affee Chart editor basic difficulty switching 2022-10-07 00:37:21 -04:00
MasterEric 8a2e4687b2 Fixed TitleState not firing onBeat 2022-09-26 17:18:19 -04:00
Eric Myllyoja 679ca4aafb Tweaks to song events 2022-09-24 15:02:10 -04:00
MasterEric cdc23f0809 Working new chart format (not working everything else :') ) 2022-09-24 01:28:39 -04:00
Cameron Taylor 4eb1b5bb78 quick and dirty new highscore check 2022-09-23 16:12:18 -04:00
Cameron Taylor 58fe9c8f8c got g-friend codeed 2022-09-23 14:26:50 -04:00
Cameron Taylor 1a1ac2a866 timing stuff all nice XD 2022-09-22 16:21:31 -04:00
Eric Myllyoja 9ebb566b2a WIP on conductor rework 2022-09-22 06:34:03 -04:00
Cameron Taylor 46c15e76f1 colors and numbers teehee 2022-09-22 04:09:06 -04:00
Cameron Taylor 37267dd7e2 songs in progres 2022-09-20 13:01:37 -04:00
Cameron Taylor afa1a9d13c better combo stuf 2022-09-20 02:37:43 -04:00
Cameron Taylor 1dbb4099ec basic result screen in progress counting tallies 2022-09-20 02:16:12 -04:00
Eric Myllyoja 7fbdbcdfad Fix merge issues 2022-09-16 15:38:36 -04:00
Eric Myllyoja 79751222e1 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-16 15:38:19 -04:00
Cameron Taylor f07d172219 data stuff moved OUT of Note.hx! 2022-09-16 01:44:50 -04:00
Eric Myllyoja 51a7282d40 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-14 22:28:04 -04:00
Eric Myllyoja 3a085e9333 Combo counter tweaks, stage position tweaks 2022-09-08 02:48:51 -04:00
Eric Myllyoja d84be39a5e Minor tweaks and fixes 2022-09-07 22:57:40 -04:00
Eric Myllyoja e3857d789f Merge branch 'master' into feature/week-4-gameplay 2022-09-07 19:12:18 -04:00
Eric Myllyoja eb3ad49a30 Work in progress on HaxeUI chart editor 2022-09-07 19:07:08 -04:00
Eric Myllyoja 7c88032551 More code for Blazin, additional shaders 2022-09-03 22:21:54 -04:00
Eric Myllyoja c26b3a828d First work in progress for Blazin 2022-08-31 02:24:09 -04:00
Eric Myllyoja 31487c0a32 Logic for double cans, partial implementation of cans into 2hot 2022-08-27 02:02:29 -04:00
Cameron Taylor eaab159c73 lit-up on street stage 2022-08-25 20:15:50 -04:00
Cameron Taylor 8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -04:00
Eric Myllyoja fe9a319814 Latest WIP on Weekend 1 appearance stuff 2022-08-16 20:26:34 -04:00
Eric Myllyoja 600c7e5441 F3 to toggle debug markers, various visual tweaks 2022-07-24 00:49:54 -04:00
Eric Myllyoja aa0962fe62 Cleanup of GameOverSubstate, fix GF duck animation duration 2022-07-22 22:25:19 -04:00
Eric Myllyoja c456355366 Scripted states and shaders. 2022-07-22 16:11:18 -04:00
Eric Myllyoja 4172fd861d First prototype of can logic 2022-07-14 19:03:42 -04:00
Eric Myllyoja ee3e1750df Work in progress on Week 8 stuff (animation offsets, death animation) 2022-07-06 21:49:42 -04:00
Eric Myllyoja 05db82c828 Added blood to henches, added moving limo, added dynamic GF combo/drop animations 2022-06-09 22:28:58 -04:00
Eric Myllyoja 9dfbfad926 First test of Week 4 Gameplay, plus fixes for MultiSparrow 2022-05-29 21:40:13 -04:00
MtH 8e2eefb605 0.2.8 character positions, dont multiply zoom, chara scaling fix 2022-05-07 18:45:49 +02:00
Cameron Taylor f37c2cbbf6 cameraOffset stuff defaulted properly 2022-05-03 14:07:18 -04:00
Cameron Taylor d835bed813 senpai stage tweaks 2022-05-03 13:27:14 -04:00
Cameron Taylor be995f0702 note styles in Note.hx that use StrumlineStyle 2022-05-03 13:02:37 -04:00
Cameron Taylor 79ce2237fc small cam fix anotha hehe 2022-05-01 15:23:09 -04:00
Cameron Taylor 769969898b camera positioning fixes 2022-05-01 15:20:15 -04:00
Cameron Taylor 282e93e1ff character repositioning proof of concept stuf 2022-04-29 23:46:41 -04:00
Eric Myllyoja 43dbce2be1 Merge remote-tracking branch 'origin/feature/scripted-modules' into feature/scripted-characters 2022-04-18 20:39:41 -04:00
Eric Myllyoja e4e516dd30 Crash fix for Stress 2022-04-18 20:09:02 -04:00
Eric Myllyoja 0b17f74f48 Merge remote-tracking branch 'origin/master' into feature/scripted-modules 2022-04-18 19:46:39 -04:00
Eric Myllyoja b6da0b5e20 Fixed Week 4 boppers and car. 2022-04-18 19:36:09 -04:00
Eric Myllyoja 25dc011df2 Many bug fixes; combo meter now works; main menu graphics split up 2022-03-29 21:56:04 -04:00
Eric Myllyoja 4b7744f4e3 Additional fixes for health icons and camera positioning. 2022-03-26 22:18:26 -04:00
Eric Myllyoja 3634346072 Stable, only position adjustments needed. 2022-03-25 22:30:37 -04:00
Eric Myllyoja 386e8db830 Ported all base game characters 2022-03-23 01:18:23 -04:00
Eric Myllyoja a7d338becb First iteration of stable custom characters, plus some other neat changes. 2022-03-21 00:19:05 -04:00
Cameron Taylor 10bafff63e Merge branch 'master' into feature/scripted-stages 2022-03-18 21:54:16 -04:00
Cameron Taylor 5f98aa7fb5 busted input fix (breaks pyro test probably) 2022-03-18 21:47:30 -04:00
Cameron Taylor a40a4663d8 parse animate removed an import lol! 2022-03-18 12:28:25 -04:00
Eric Myllyoja 1a85b4a1ce First WIP of scripted characters (NOT WORKING) 2022-03-17 01:40:08 -04:00
Eric Myllyoja 60c6e5ee29 Various bug fixes for strumlines 2022-03-14 20:48:45 -04:00
Eric Myllyoja 1935373963 Hide song name in play state 2022-03-13 14:47:59 -04:00
Eric Myllyoja 0cc4f8a982 Scripted modules are stable but missing some features. 2022-03-13 14:36:03 -04:00
Eric Myllyoja 49b2907a30 Scripted module and script event systems, reworked strumlines. 2022-03-11 01:30:01 -05:00
Cameron Taylor d477320894 xmas mall positioning fix (plus score reset, lol!) 2022-03-09 18:57:36 -05:00
Cameron Taylor ef665df9d0 hold note balance shit lol! unrelated to polymod!! 2022-03-09 15:04:35 -05:00
Cameron Taylor 9dcffaa3fa spirit layering fix 2022-03-09 14:06:10 -05:00
Eric Myllyoja 19cda4ed15 Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages 2022-03-09 10:36:39 -05:00
Eric Myllyoja 57fcb74657 Spirit trail is now behind 2022-03-09 10:36:13 -05:00
Cameron Taylor 45b9d725f2 tankman cloud reset? 2022-03-09 10:29:03 -05:00
Eric Myllyoja 404b2b648e Modified every file in the codebase to solve a single bug. 2022-03-08 03:13:53 -05:00
Renamed from source/PlayState.hx (Browse further)