1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-13 00:45:13 +00:00
Commit graph

1732 commits

Author SHA1 Message Date
EliteMasterEric 005ffafe23 Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview 2023-08-01 16:03:34 -04:00
Cameron Taylor 13c5297ccc Merge pull request #120 from FunkinCrew/feature/chart-editor-bpm
Chart Editor: BPM Changes
2023-08-01 15:55:32 -04:00
Cameron Taylor 20658e0590 Merge branch 'feature/chart-editor-bpm' of https://github.com/ninjamuffin99/Funkin-secret into feature/chart-editor-bpm 2023-08-01 15:34:24 -04:00
EliteMasterEric 639a36a9c7 Fix some weird issues with constants 2023-08-01 15:29:17 -04:00
EliteMasterEric 9b66bc186a alphabetical -> alphabetically 2023-08-01 15:25:46 -04:00
Cameron Taylor da465ff46d Merge branch 'feature/chart-editor-bpm' of https://github.com/ninjamuffin99/Funkin-secret into feature/chart-editor-bpm 2023-08-01 14:25:34 -04:00
EliteMasterEric 979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
EliteMasterEric 68ccc3bceb Fixed UI scaling issue (thanks Ian!!!) 2023-08-01 13:07:16 -04:00
EliteMasterEric f759d0923f Update HaxeUI 2023-08-01 12:30:37 -04:00
Cameron Taylor 7bd472e709 Merge pull request #113 from FunkinCrew/feature/new-input-system-yay
New input system (yay)
2023-07-31 16:22:12 -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 624d4f5111 Fix asset redirection 2023-07-31 15:04:18 -04:00
EliteMasterEric c0745d4ad7 Hide warning 2023-07-31 14:08:48 -04:00
Eric 918ca17246 Merge pull request #118 from FunkinCrew/hmm-update
added --quiet to github action
2023-07-31 14:04:46 -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
Cameron Taylor 0388410e73 added --quiet to github action 2023-07-31 11:41:34 -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 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 a6daf3b0d6 Resolved lag issues caused by creating too many notes in the pool. 2023-07-25 23:11:12 -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
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
Cameron Taylor e21511bc13 Merge pull request #108 from FunkinCrew/feature/chart-editor-importer
Chart editor legacy importer
2023-07-22 22:48:43 -04:00
Cameron Taylor cd2f0d840d Merge pull request #115 from FunkinCrew/feature/asset-redirect-2
Asset redirecting
2023-07-22 22:48:09 -04:00
EliteMasterEric 92f3a4823d Update Polymod to fix lag issues 2023-07-22 20:18:06 -04:00
EliteMasterEric 3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
Cameron Taylor f634a099c3 actual songdata git merge proper lol 2023-07-22 14:43:28 -04:00
Cameron Taylor 85af96d654 Merge branch 'master' into feature/chart-editor-importer 2023-07-22 14:43:05 -04:00
Cameron Taylor 9e40ed9006 Merge pull request #114 from FunkinCrew/bugfix/conductor-monster
Fixes to Conductor for Monster
2023-07-22 12:59:51 -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 16e3bfe85e Fix for BPM changes, plus working on hold note rendering 2023-07-19 21:16:39 -04:00
EliteMasterEric c56517f94f Sort the template view 2023-07-19 01:30:43 -04:00
EliteMasterEric 140afd3c31 Redo note positioning 2023-07-19 01:30:36 -04:00
EliteMasterEric ae76b24a65 New time calculation functions 2023-07-19 01:30:23 -04:00
EliteMasterEric b572f518db Update HaxeUI 2023-07-19 01:29:50 -04:00
EliteMasterEric adda3020a9 Alphabetical sort 2023-07-19 01:29:43 -04:00
EliteMasterEric ce0be2374d Event notes have different sprites for each type. 2023-07-19 01:29:13 -04:00
EliteMasterEric d251d71daa Asset redirect 2023-07-17 21:54:58 -04:00
EliteMasterEric 3d8459fe6f Added dependency to HTML5 lime build 2023-07-15 04:22:02 -04:00
EliteMasterEric ddcb0474a3 Convert command to Bash 2023-07-14 23:07:17 -04:00
EliteMasterEric 5a70a50a56 Remember to build Lime on HTML5 too. 2023-07-14 22:53:11 -04:00
EliteMasterEric f675a5c578 Fix actions more 2023-07-14 22:25:51 -04:00
EliteMasterEric 8fe837d76d Attempt to fix github actions 2023-07-14 19:51:45 -04:00
EliteMasterEric 16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -04:00