Commit Graph

1674 Commits

Author SHA1 Message Date
CuckyDev
7a0a8c3d6e Maybe fix missing FPS counter
put the toggleFPS code after all save file crap so that it might work better
2021-07-12 00:53:44 -04:00
Kade M
d48a72fca9 Merge pull request #1259 from SimplyMerlin/synced-death-screen
Blue balls now bounce to da beat
2021-07-11 19:29:35 -07:00
Kade M
361555cfa3 funny stuff 2021-07-11 19:00:46 -07:00
Kade M
d6d3bb340f Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-07-11 18:31:02 -07:00
Kade M
9323c03fed LN and health drain work 2021-07-11 18:30:52 -07:00
Kade M
805d86e97d Merge pull request #1269 from Spel0/bf-fix-v2
Bf animations fix v2
2021-07-11 18:13:23 -07:00
Spel0
f75405939a fix v2 2021-07-12 03:03:08 +03:00
Kade M
f8ae7c1234 pog 2021-07-11 16:13:01 -07:00
Kade M
200f36995a Merge pull request #1267 from cuckydev/master
Various fixes and improvements
2021-07-11 15:38:50 -07:00
CuckyDev
6876a48875 Merge branch 'master' into master 2021-07-11 18:38:20 -04:00
Kade M
55415c9864 Merge pull request #1265 from GithubSPerez/master
Editor grid sub-divisions, separate editor options window & more
2021-07-11 15:37:37 -07:00
Kade M
573ef74a2b note check fix fr 2021-07-11 15:37:16 -07:00
Kade M
c5038bbed4 fix note check 2021-07-11 15:37:10 -07:00
CuckyDev
321badd0b2 Fix issues with HTML5 and note drawing 2021-07-11 18:36:12 -04:00
Kade M
a575a4c9c4 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-07-11 15:33:57 -07:00
Kade M
9a7a4b3463 fix some stuff and LN work 2021-07-11 15:32:55 -07:00
CuckyDev
ad89799f58 Fix note positioning 2021-07-11 18:09:20 -04:00
CuckyDev
910105b852 Rewrite MusicBeatState stuff 2021-07-11 18:04:47 -04:00
sperez
1fd6cdde91 Moved editor options to a separate window, added some editor features (read desc)
-Added grid sub-divisions up to 4, implemented for both mouse editing and number key editing

-Made a separate editor options window that contains:
*Amount of sub-divisions
*Snap to grid checkbox (now holding shift cancels out the check box)
*Play hitsounds checkbox
*Mute instrumental checkbox
2021-07-11 17:43:00 -04:00
Spel0
ab0c9bfeb4 flip 2021-07-11 22:29:57 +03:00
sperez
5c0124f398 Adjusted editor HUD elements
-Made the camera follow object independent from the strum line

-Resized the strum line to exactly the size of the grid
2021-07-11 14:53:04 -04:00
Merlin
ed75cd00e3 Blue balls now bounce to da beat 2021-07-11 13:32:46 +02:00
CyndaquilDAC
7eac3fdca7 oops forgot the gf scroll factor 2021-07-10 22:55:05 -05:00
CyndaquilDAC
3673011f85 Add gf to customize gameplay screen 2021-07-10 22:54:04 -05:00
Kade M
f67d0e4d92 Merge pull request #1244 from SimplyMerlin/master
Sync story mode menu to the beat
2021-07-10 20:42:56 -07:00
Kade M
2ba3f22bb4 Merge pull request #1250 from CyndaquilDAC/new-screenshots
New screenshots for readme
2021-07-10 20:42:48 -07:00
Kade M
81f0d48f1b Merge pull request #1249 from GithubSPerez/color-quantization
Colors by quantization option & hud arrows code cleanup
2021-07-10 20:42:18 -07:00
CyndaquilDAC
e4342e1ef0 this should probably use the new logo too 2021-07-10 22:31:19 -05:00
sperez
9e1db7155c Colors by quantization option & hud arrows code cleanup
-Added an option to make the colors of the arrows depend on their quantization instead of their direction (still needs to be adjusted to work on changing BPMs)

-Cleaned up the load code for the hud (static) arrow's animations

-Re ordered some appearance options
2021-07-10 23:22:54 -04:00
CyndaquilDAC
fedca4e032 screenshots and readme stuff 2021-07-10 22:20:47 -05:00
CyndaquilDAC
86b826a521 Merge branch 'KadeDev:master' into master 2021-07-10 22:00:03 -05:00
Kade M
2897fdc489 oops forgot about this 2021-07-10 17:01:29 -07:00
Merlin
a78d82e65f fix indents & headbop no longer overwrites confirm 2021-07-11 01:51:53 +02:00
Merlin
c23f9738e3 Sync story mode menu to the beat 2021-07-11 01:35:21 +02:00
Kade M
388c6215c7 fix compile errors + some other shit 2021-07-10 12:21:21 -07:00
Kade M
62b457baaf Merge pull request #1238 from prokube/tasks
Add a `tasks.json` file for better testing in VSC
2021-07-10 11:47:31 -07:00
Kade M
4c98487698 Merge pull request #1239 from ACardboardBox1/caching-logo-antialiasing
give the logo on the caching screen antialiasing
2021-07-10 11:46:53 -07:00
ACardboardBox
c890c7b5fd give the logo on the caching screen antialiasing 2021-07-10 10:36:26 -04:00
Prokube
72d800581a Merge branch 'master' into tasks 2021-07-10 07:08:38 -07:00
Prokube
3cb6ea7393 A 2021-07-10 06:48:18 -07:00
Prokube
bbe3cf1a3e Create .vscode/ 2021-07-10 06:43:57 -07:00
Kade M
268bab8b93 Merge pull request #1229 from Spel0/bf-fix
Bf animations fix
2021-07-10 03:47:32 -07:00
CyndaquilDAC
3cf76aa597 Merge branch 'KadeDev:master' into master 2021-07-10 01:32:41 -05:00
Spel0
6713695988 fix 2021-07-10 03:40:54 +03:00
Kade M
f427f82c0f Merge pull request #1222 from SimplyMerlin/master
Make title screen more swag
2021-07-09 17:16:48 -07:00
Kade M
124fdbd015 Merge pull request #1228 from GithubSPerez/animation-code-cleanup
Cleaned up direction animation code in:
2021-07-09 17:16:08 -07:00
Spel0
c6c970912e Update Project.xml 2021-07-10 00:53:22 +03:00
sperez
54ba25145b Cleaned up direction animation code in:
Playstate.hx (player 1 & 2)
Note.hx (gfx load code & playAnim's)
2021-07-09 17:44:50 -04:00
SimplyMerlin
2bfdb07615 make title screen bump sync with freeplay song 2021-07-09 17:53:56 +02:00
SimplyMerlin
0d8e433998 less duplicate code 2021-07-09 17:41:14 +02:00