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
4431 commits 30 branches 20 tags 6.8 GiB
Commit graph

230 commits

Author SHA1 Message Date
EliteMasterEric 3366240eb5 Fix "Edit Event" menu item when right clicking chart events 2024-01-15 18:21:49 -05:00
Cameron Taylor 0f03021c20 tooltip fix 2024-01-14 08:52:43 -05:00
EliteMasterEric 180e9eefc8 Fix an issue with parsing enums in HScript. 2024-01-14 06:47:17 -05:00
EliteMasterEric 444e5b7040 Several library updates to fix bugs. 2024-01-12 22:02:37 -05:00
Cameron Taylor e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
EliteMasterEric 025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
EliteMasterEric eea9ac1883 Update to include linux fix (???) 2024-01-10 20:27:40 -05:00
EliteMasterEric 043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -05:00
EliteMasterEric a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
Cameron Taylor 11d21c1369 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2024-01-01 19:09:36 -05:00
EliteMasterEric a4c993f733 Update HaxeUI and Flixel 2023-12-23 16:25:50 -05:00
EliteMasterEric 711253a202 Update HaxeUI to latest 2023-12-19 16:12:25 -05:00
EliteMasterEric f01535e431 Don't forget to update hmm! 2023-12-19 01:28:24 -05:00
EliteMasterEric 8dd6f29e26 Move all haxelib forks to the FunkinCrew organization. 2023-12-15 04:34:59 -05:00
EliteMasterEric 3f2d1b4c1b Update haxelibs, add flixel-text-input to fix overlapping text 2023-12-14 17:34:02 -05:00
EliteMasterEric ba3bf4e846 Update HaxeUI again 2023-12-14 17:05:48 -05:00
Cameron Taylor 4193cd4ee2 proper dialog fading 2023-12-13 18:24:55 -05:00
EliteMasterEric a0ae30a7c1 Metronome slider and scroll anchor 2023-12-01 17:14:48 -05:00
EliteMasterEric 90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric 9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
Eric 55779630f4 Update to latest HaxeUI (#221) 
* Update to latest HaxeUI

* Update HaxeUI again

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:18:25 -05:00
Eric 260f1bd265 [BUGFIX] Fix an issue where PlayState would crash after the second song. (#216) 
* Ignore blank lines in intro text

* Add a check when trying to render destroyed graphics.

* Persist noteSplash graphic so it isn't destroyed.
 2023-11-20 10:42:23 -05:00
EliteMasterEric a605f53e07 Updated git references for haxeui-core and 
haxeui-flixel
 2023-11-05 00:07:49 -04:00
EliteMasterEric 8042f6c5a8 Update HaxeUI again 2023-10-19 15:05:54 -04:00
EliteMasterEric fb4a307195 Update hmm and HaxeUI 2023-10-19 01:24:20 -04:00
Cameron Taylor afcb677fac index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort 2023-10-17 00:38:28 -04:00
EliteMasterEric f652beb382 Fix several merge errors. 2023-10-09 20:04:21 -04:00
Cameron Taylor ab5d6d2f48 sounds in progress 2023-10-09 18:33:50 -04:00
Cameron Taylor b20cb27f82 hue shifting in progress 2023-10-09 18:31:06 -04:00
Cameron Taylor a8e39d90e8 temp rank stuff in progress 2023-10-09 18:27:17 -04:00
EliteMasterEric e33c825a1f Merge branch 'rewrite/master' into rewrite/feature/chart-editor-variation-button 2023-10-06 23:11:11 -04:00
EliteMasterEric 92162bfdad Fix crash handler without breaking HaxeUI 2023-09-28 16:49:01 -04:00
EliteMasterEric 42bb50882d "Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues. 2023-09-25 23:24:07 -04:00
EliteMasterEric 62c62cb53e Update json2object to fork 2023-09-25 21:18:56 -04:00
EliteMasterEric 86c105aff8 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-18 21:58:22 -04:00
EliteMasterEric 0d84559606 HTML5 should build now 2023-09-18 17:19:31 -04:00
EliteMasterEric 459a96a791 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-12 18:54:14 -04:00
EliteMasterEric 12c8362321 Revert OpenFL to the version which has no crash handler but un-breaks the HaxeUI style. 2023-09-12 18:38:55 -04:00
EliteMasterEric 12b5f3fbc1 Updated json2object. 2023-09-08 17:44:11 -04:00
Eric bb09cc19e7 HTML5: Several fixes to asset loading (#136) 
* Update Polymod to fix async script loading.

* Got into the Main Menu but playstate doesn't work

* Got into PlayState but GF script breaks!

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-09-04 22:18:45 -04:00
Eric dd4403d673 Update hmm.json to update flixel-addons (#146) 
* Update hmm.json to include new flixel-addons

* flixel-addons update

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-09-04 22:06:52 -04:00
Eric 21f44edf1d New crash handler + Additional null safety for ChartEditorState (#130) 
* A bunch of smaller syntax tweaks.

* New crash handler catches and logs critical errors!

* Chart editor now has null safety enabled.

* Fix -W build issue.

* Actually update hmm.json to use the crash handling branch

* Fix issues causing crash handler to trigger
 2023-08-28 15:03:29 -04:00
Eric 42d8d55067 Unit Test Suite (#119) 
* Initial test suite

* Fix some build warnings

* Implemented working unit tests with coverage

* Reduced some warnings

* Fix a mac-specific issue

* Add 2 additional unit test classes.

* Multiple new unit tests

* Some fixins

* Remove auto-generated file

* WIP on hiding ignored tests

* Added list of debug hotkeys

* Remove old website

* Remove empty file

* Add more unit tests

* Fix bug where arrows would nudge BF

* Fix bug where ctrl/alt would flash capsules

* Fixed bug where bf-old easter egg broke

* Remove duplicate lines

* More test-related stuff

* Some code cleanup

* Add mocking and a test assets folder

* More TESTS!

* Update Hmm...

* Update artist on Monster

* More minor fixes to individual functions

* 1.38% unit test coverage!

* Even more tests? :O

* More unit test work

* Rework migration for BaseRegistry

* gameover fix

* Fix an issue with Lime

* Fix issues with version parsing on data files

* 100 total unit tests!

* Added even MORE unit tests!

* Additional test tweaks :3

* Fixed tests on windows by updating libraries.

* Set versions for flixel-ui and hamcrest

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-08-22 04:27:30 -04:00
EliteMasterEric 1caf905ef8 Update Lime 2023-08-03 17:44:17 -04:00
EliteMasterEric ba0ed22c1b Update Polymod 2023-08-03 13:07:30 -04:00
EliteMasterEric 2ba2aab2e3 Update Polymod 2023-08-03 12:55:29 -04:00
EliteMasterEric 4e1a5d6d65 Use cached builds for Lime 2023-08-03 11:47:40 -04:00
EliteMasterEric 113b4c45a4 Attempt at fixing Github Actions on WIN and HTML5 2023-08-03 09:23:53 -04:00
EliteMasterEric 005ffafe23 Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview 2023-08-01 16:03:34 -04:00
EliteMasterEric 979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
EliteMasterEric f759d0923f Update HaxeUI 2023-08-01 12:30:37 -04:00
Cameron Taylor 8efc7004ea long-id and removed hmm from hmm.json 2023-07-31 15:46:19 -04:00
Cameron Taylor d750af4396 directory fix and hmm lock 2023-07-31 15:40:47 -04:00
EliteMasterEric d0ef34ced6 Merge branch 'master' into feature/new-input-system-yay 2023-07-26 22:00:14 -04:00
EliteMasterEric 26112aa6ed Update HaxeUI 2023-07-26 21:55:47 -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
Cameron Taylor 211ccc2e47 Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks 
Tweaks and improvements to the animation editor
 2023-07-24 16:26:04 -04:00
Cameron Taylor 56f1b6896a update hxCodec 2023-07-24 16:04:35 -04:00
EliteMasterEric 92f3a4823d Update Polymod to fix lag issues 2023-07-22 20:18:06 -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 b572f518db Update HaxeUI 2023-07-19 01:29:50 -04:00
EliteMasterEric d251d71daa Asset redirect 2023-07-17 21:54:58 -04:00
EliteMasterEric 24c9786166 Merge branch 'master' into feature/new-input-system-yay 2023-07-10 18:16:16 -04:00
EliteMasterEric a9d8fb8dfb Updated HaxeUI for good measure 2023-07-06 12:33:50 -04:00
EliteMasterEric f932422d74 Merge branch 'master' into feature/week-6-dialogue 2023-07-03 13:18:53 -04:00
Cameron Taylor d1333b9b24 new hxcodec stuff 2023-06-27 12:45:41 -04:00
EliteMasterEric 6f737a1805 Update hxCodec to latest stable. 2023-06-25 12:36:12 -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 2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
Cameron Taylor 89535cb5cd simple lime update... lol! 2023-06-09 14:02:45 -04:00
Cameron Taylor 8671846a73 updated hxcodec in hmm 2023-06-09 13:37:38 -04:00
EliteMasterEric 9a04678399 Validated JSON formatting on 287 files. 2023-06-08 16:28:58 -04:00
EliteMasterEric a2b08e3e34 Update hxCodec 2023-06-06 17:38:40 -04:00
EliteMasterEric 57caeef802 Work on re-enabling cutscenes 2023-06-02 14:35:08 -04:00
EliteMasterEric dc932eb8d7 A few bug fixes related to vocal tracks 2023-05-25 19:36:32 -04:00
Cameron Taylor 7e551c8247 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/new-story-menu 2023-05-24 16:35:02 -04:00
Cameron Taylor a7c86b2011 Merge branch 'master' into feature/new-story-menu 2023-05-24 16:24:36 -04:00
EliteMasterEric 6b27fe84ab Update library versions 2023-05-24 15:46:23 -04:00
Cameron Taylor bd273cbd5a openfl hmm fix? 2023-05-23 00:08:42 -04:00
EliteMasterEric 482de2a122 Added Nightmare difficulty (stub) 2023-05-22 20:55:53 -04:00
EliteMasterEric 021f7a0a1c Work in progress on story menu data storage rework 2023-05-16 22:09:53 -04:00
Cameron Taylor 03cab4a326 Merge pull request #81 from FunkinCrew/results-anims 
different result screen in progress
 2023-04-24 17:59:20 -04:00
EliteMasterEric 337802a6bf Fixed an issue where SongEventScriptEvent would not be dispatched 2023-04-20 13:48:15 -04:00
Cameron Taylor e872dddd15 looping fix 2023-04-17 17:59:22 -04:00
Cameron Taylor c2e340ef19 variation and hmm fix 2023-04-16 18:57:18 -04:00
Cameron Taylor f411cdac88 different result screen in progress 2023-04-16 15:33:20 -04:00
Cameron Taylor 4c7f614674 hxCodec commit ref fix 2023-03-01 21:36:06 -05:00
EliteMasterEric fe92d00a04 Numerous chart editor fixes. 2023-02-28 21:06:09 -05:00
EliteMasterEric 8c002393e3 Update hmm.json 2023-02-26 22:45:02 -05:00
EliteMasterEric f0432773e8 Merge branch 'master' of https://github.com/FunkinCrew/Funkin-secret 2023-02-23 22:15:31 -05:00
EliteMasterEric 4e16705052 Fixed hxcodec hash 2023-02-22 21:19:28 -05:00
Cameron Taylor 9ef5974e52 build fix? 2023-02-22 15:30:58 -05:00
EliteMasterEric 9455689de9 Adobe animate fixes 2023-02-22 15:26:01 -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 086795b3de fixed lime thing lol 2023-02-09 02:36:39 -05:00
EliteMasterEric ac3e1c1899 CAM STOP BREAKING HMM.JSON 2023-02-02 18:30:10 -05:00
EliteMasterEric 8329196118 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2023-02-02 18:28:11 -05:00
EliteMasterEric c0bd57a573 Fix library versions. 2023-02-01 16:54:11 -05:00
Cameron Taylor 0f9d0a6c98 stage editor in progress 2023-01-27 02:38:37 -05:00
Cameron Taylor fccfcaefb2 polymod lol 2023-01-23 23:40:15 -05:00
Cameron Taylor 6e019c1785 hmm lib reference! 2023-01-23 23:37:57 -05:00
EliteMasterEric 7f9171203a Merge branch 'feature/2-chart-2-editor' 2023-01-02 17:43:19 -05:00
EliteMasterEric b3b7fb49c2 Difficulty selector and player previews 2022-12-17 15:19:42 -05:00
EliteMasterEric a2d803cc83 Note quant snapping 2022-12-14 15:33:30 -05:00
Cameron Taylor 0b24dd537e Merge branch 'freeplay-sort' 2022-12-14 13:55:01 -05:00
Eric Myllyoja 234dc0ac19 Vocal group work 2022-12-13 17:38:55 -05:00
Eric Myllyoja 19b2f3799a Chart wizard plus shader fixes 2022-12-08 19:33:47 -05:00
Cameron Taylor 3f28fdb92c song name on result screen stuff WIP 2022-12-02 21:37:07 -05:00
Eric Myllyoja 7ddfe82dab Polymod fix 2022-11-23 20:52:03 -05:00
Eric Myllyoja a0315fbb83 Pinned development versions to working commits 2022-11-23 16:58:49 -05:00
Eric Myllyoja 77ce6795ae Update Polymod version 2022-11-23 16:37:32 -05:00
Eric Myllyoja 6e8feecef1 Many improvements to chart system and song format logic 2022-10-26 01:14:29 -04:00
MasterEric fc4f398157 Playbar fixes 2022-10-14 23:01:41 -04:00
Eric Myllyoja 175908f827 Updated chartformat v7 2022-10-10 20:04:09 -04:00
Cameron Taylor 09a037b20b basic sort and search 2022-09-26 18:22:45 -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 eb3ad49a30 Work in progress on HaxeUI chart editor 2022-09-07 19:07:08 -04:00
Cameron Taylor 8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -04:00
Eric Myllyoja 2bef1cb88a Adjusted firing streak and angle. 2022-08-22 21:55:30 -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 705d0ed5b9 Updated hmm deps, no more forks! 2022-06-12 00:02:49 -04:00
Eric Myllyoja 4999d2b268 Updated HScript to fix a bug with variables not being stored. 2022-06-09 03:31:31 -04:00
Eric Myllyoja ddd35d3bb0 Updated Polymod to fix several breaking script bugs. 2022-06-09 00:12:37 -04:00
Cameron Taylor 91690ed1e4 hmm workflow test? 2022-05-13 13:24:20 -04:00
Cameron Taylor 6867c25729 hmm lock stuff 2022-05-13 13:14:57 -04:00
Cameron Taylor 61c6f477ef HMM setup in progress 2022-05-13 13:03:52 -04:00