Commit graph

702 commits

Author SHA1 Message Date
minenice55
e8975c6dc4 fix all merge conflicts
unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this
2022-08-09 11:23:17 -04:00
minenice55
6ac37d51d4 Merge branch 'master' into pr/140 2022-08-09 10:20:59 -04:00
minenice55
7e93d62347 improve feedback on combo finish out 2022-08-07 20:24:07 -04:00
minenice55
3f7af6a0eb joe prepare animation
- bg effect preview (buggy)
- adjusted path of hit items
- adjusted particle limits and spawning
- rain is now affected by wind
- cont. work on joe expressions

- animation helper sync scale now plays thru events properly
- adjusted timing windows
2022-08-07 19:40:06 -04:00
minenice55
bd0d05772a cooking pot lids fly off
- also fixes issues with fading shadow colours
- TODO: make fading bg texture colour more intuitive
2022-08-06 21:09:28 -04:00
minenice55
c4693eb093 background colour fading
- also allows fading of shadow and background texture colours
2022-08-06 19:15:44 -04:00
minenice55
2d4af47609 facial expressions
- activated thru certain actions (NG input, special moves) or can be forced via entity
2022-08-05 22:37:06 -04:00
minenice55
7509224289 background particles, gradient 2022-08-05 21:19:18 -04:00
minenice55
86c0e7eb0a recolourable shadows
- rework now has parity with the old version
2022-08-03 18:55:13 -04:00
minenice55
35ff6bdd45 background effects, special move camera
- also removed all old karate man assets
2022-08-03 17:49:32 -04:00
minenice55
f277a131db finish effect 2022-08-03 16:14:37 -04:00
minenice55
ef8b4011fe particle adjust 2022-07-30 21:33:11 -04:00
minenice55
e37de018cd kicks complete, start work on particles
- bg colour can now be changed
2022-07-30 21:16:48 -04:00
minenice55
1b5288f7e9 hit effect start, kick charge 2022-07-29 22:25:48 -04:00
minenice55
463ae454d0 start work on kicks 2022-07-29 15:26:59 -04:00
minenice55
d0c0041bd0 replace old karate man prefab with new one 2022-07-29 15:06:22 -04:00
minenice55
e6e797a85e add y-offset functionality to start position offset 2022-07-29 12:52:59 -04:00
minenice55
a583529087 fully functional combo, several object types 2022-07-29 12:18:17 -04:00
minenice55
e5cb58ce9a combo input 2022-07-28 22:09:48 -04:00
minenice55
859e719e3c start working on inputs
- InputType enum is now flags, can be combined together
2022-07-28 19:12:21 -04:00
minenice55
94bd62d5a2 Merge branch 'master' into karate-man-2 2022-07-28 19:09:59 -04:00
minenice55
5079bd9b6f
Merge pull request #139 from ThatZeoMan/master
Track 5, along with QOL changes
2022-07-28 19:09:07 -04:00
ThatZeoMan
309e4997e1 vfx flashes work again
thanks for the help, minenice
2022-07-28 18:07:19 -05:00
ThatZeoMan
ec7936b954 Track 5 fully functional
also fixed karate man's Set Background Effects
2022-07-28 17:16:20 -05:00
minenice55
a78235cea0 Merge branch 'master' into karate-man-2 2022-07-28 11:32:10 -04:00
ThatZeoMan
aa9379e21e start gearing up for track 5
it is battery acid color (i will change it)

i probably did this wrong
2022-07-28 00:17:02 -05:00
minenice55
8680d13989 create classes 2022-07-27 18:35:18 -04:00
Mytiaoga
938580b880 Update repo to latest 2022-07-27 17:04:02 +08:00
ThatZeoMan
774bbea916 Update TramAndPauline.cs 2022-07-26 18:19:05 -05:00
ThatZeoMan
818e8a4cd5
Merge branch 'megaminerjenny:master' into master 2022-07-26 19:05:32 -04:00
ThatZeoMan
93f5244969 move flash to VFX 2022-07-26 18:04:02 -05:00
adianfiuef
09581bddca Tram&Pauline animation update 2022-07-26 14:14:28 -04:00
minenice55
5433b85e58 start karate man redo 2022-07-26 11:37:02 -04:00
minenice55
111531b07d make dropdown properly update after auto-search 2022-07-26 08:54:59 -04:00
minenice55
d8f4a4bb70 update joyshock gyro and touch states 2022-07-25 18:56:13 -04:00
minenice55
d3c3beb950 playstation controller lightbar colours
- fix controller feature flags not actually being flags
2022-07-25 18:36:32 -04:00
minenice55
a713895f96 move duplicate code to own method 2022-07-25 12:49:43 -04:00
adianfiuef
e343e66b8d Tram&Pauline
Animation mostly done perfectly
2022-07-25 01:04:16 -07:00
Mytiaoga
180fea7832 Merge branch 'master' of https://github.com/Mytiaoga/HeavenStudio 2022-07-25 10:09:25 +08:00
Mytiaoga
0c743b44d5 First Contact, Tap Trial, Air Rally
First Contact
- Fixed a bug

Tap Trial
- All anims and input are implemented

Air Rally
- Initialization
2022-07-25 10:04:55 +08:00
Mytiaoga
059aba74bf
Add files via upload 2022-07-25 10:04:43 +08:00
Mytiaoga
fb169868b5
Add files via upload 2022-07-25 10:03:01 +08:00
Mytiaoga
bb81e24572
Add files via upload 2022-07-25 10:02:33 +08:00
minenice55
7e275365b8 dual joy-con support
- add controller icons in the controller selection menu
2022-07-24 18:38:00 -04:00
minenice55
06fe482f3d add controller selection, auto-search
- fix bug in master volume control where the text input doesn't work
- fix bug in the Fan Club minigame where the player wouldn't jump when they were supposed to
2022-07-23 22:24:07 -04:00
minenice55
ecbe84074f heavy rework of our input system
- implement the InputController abstract class, an adapter class for any HID interface to use common controller methods relevant to Heaven Studio
- implement InputKeyboard and InputJoyshock classes, for keyboard input and controllers driven by JoyShockLibrary respectively
- add Linux compile of JoyShockLibrary
2022-07-23 20:36:10 -04:00
minenice55
6699e7d98b basic controller input from JSL
may need compiles for linux and mac
2022-07-19 18:50:35 -04:00
minenice55
86a4f6efcd Update Editor.unity 2022-07-17 18:26:21 -04:00
minenice55
afaacfe796 prepare controller settings menu 2022-07-17 18:25:54 -04:00
minenice55
063513ded6 update Fan Club character sheets to HD assets 2022-07-16 23:41:26 -04:00
minenice55
92577ae3e2
Merge pull request #135 from Mytiaoga/master
First Contact & Tap Trial Updates
2022-07-11 19:54:21 -04:00
Mytiaoga
f726fb93ce
First Contact - Fixed bug for [lookAt] 2022-07-11 16:55:35 +08:00
Mytiaoga
68d560b8bc
First Contact - Toggle Live Bar beat
- On beat or Off beat live bar
2022-07-11 15:38:34 +08:00
Mytiaoga
5e7acfee17
Add files via upload 2022-07-11 15:22:00 +08:00
Mytiaoga
111fbaf159
First Contact - slight change on Mission Control 2022-07-11 15:21:17 +08:00
Mytiaoga
45da7c6d54
Add files via upload 2022-07-11 14:28:55 +08:00
Mytiaoga
174251eda1 Current version pull
Updated First Contact anims
2022-07-11 14:22:12 +08:00
Mytiaoga
e80c9dc3fa First Contact - Revert Offbeat to OnBeat Live 2022-07-11 14:06:30 +08:00
Mytiaoga
86b8766259 Merge branch 'master' of https://github.com/Mytiaoga/HeavenStudio 2022-07-11 13:54:26 +08:00
Mytiaoga
4f08887078 First Contact & Tap Trial
First Contact:
Live is now offbeat
[alienSuccess] code block is a bit smaller
Mission Control is now stretchable

Tap Trial
- Started working on coding the inputs
- Animated monkey (tap, double, and triple (incomplete))
2022-07-11 13:53:25 +08:00
minenice55
28275d19cf
Merge pull request #131 from saladplainzone/master
Space Dance - Initial Implementation
2022-07-10 19:32:21 -04:00
saladplainzone
4a55614416 First Contact - General Refinements (Anims, LIVE text) 2022-07-10 16:28:29 -07:00
saladplainzone
0eb47fa1bf Merge remote-tracking branch 'upstream/master' 2022-07-10 14:56:09 -07:00
minenice55
bddb36af0c update credits text 2022-07-10 17:55:06 -04:00
minenice55
9f3e0de3b4 missing fit to song 2022-07-10 17:45:59 -04:00
minenice55
a7bea351c5 add cursor toggle, master volume 2022-07-10 17:39:14 -04:00
saladplainzone
3f530adf33 Space Dance - Input Changes 2022-07-09 23:32:58 -07:00
minenice55
7fd1617ea7 add tabs system to editor settings 2022-07-09 23:22:59 -04:00
ThatZeoMan
6754a34e26 Unified minigame titles 2022-07-09 22:02:59 -05:00
ThatZeoMan
f27d16a1a5 Further simplified Coin Toss
Also added 3 new color attributes: colorD, colorE, and colorF
2022-07-09 21:42:28 -05:00
ThatZeoMan
f7c6cedc08 Combined Coin Toss's "Set XXXXground color" into one
also renamed "Hit3" to "HitX"
2022-07-09 21:20:30 -05:00
minenice55
52ff2a7829 settings resolution changer 2022-07-08 22:11:55 -04:00
minenice55
be5aff5aae prep settings menu for real 2022-07-08 18:49:15 -04:00
minenice55
2409a20aab fix layer 4 not being usable at certain window sizes 2022-07-08 17:58:58 -04:00
minenice55
ee142c9bcc fix issue with param disabling 2022-07-08 16:20:39 -04:00
minenice55
4a410a7f18 property scrolling 2022-07-08 16:11:51 -04:00
minenice55
216c50a99f duplicating entities can now be undone / redone 2022-07-08 12:50:23 -04:00
minenice55
4d3e330f90
Merge pull request #128 from Mytiaoga/master
First Contact & DJ School updates
2022-07-08 10:58:07 -04:00
minenice55
e9346a5791 fix dj school assetbundle 2022-07-08 10:57:42 -04:00
minenice55
5515397df1 remove old files 2022-07-08 10:38:13 -04:00
minenice55
355a8d61a7 Merge branch 'master' into pr/128 2022-07-08 10:36:30 -04:00
Mytiaoga
614059a4d3 Updated Inputs for some minigames
First Contact & DJ School has their inputs methods updated
2022-07-08 13:27:10 +08:00
minenice55
e2956f7c29 make copying use deep copies lol 2022-07-04 13:09:23 -04:00
minenice55
fb39a7c5fe copy entities, prep settings menu 2022-07-04 12:57:19 -04:00
minenice55
21c175d025 fully functional snap change menu 2022-07-04 11:29:19 -04:00
minenice55
70a335da5d spawn tempo changes on load 2022-07-04 10:28:40 -04:00
Mytiaoga
b1a491b50a First Contact - Updated Input Manager
Also changed the game icon w/ mask
2022-07-03 16:42:18 +08:00
minenice55
a57536be17 get stuff ready for canary 2022-07-01 22:31:58 -04:00
minenice55
b02a6b0b8a event scroll fixes 2022-07-01 22:29:16 -04:00
minenice55
ae944062c5 selecting crap works properly now 2022-07-01 22:03:15 -04:00
minenice55
8e16e9be04 event selection doesn't go offscreen anymore
github copilot is insane it wrote half of the code in this commit lmao
2022-06-30 15:51:13 -04:00
minenice55
c27ae71727 Merge branch 'master' into responsive-editor 2022-06-30 14:48:48 -04:00
minenice55
d1ee45fe7a editor fully scaleable 2022-06-29 21:58:21 -04:00
Mytiaoga
abcf66ff5a First Contact - Game Icon 2022-06-29 13:40:09 +08:00
Mytiaoga
6165203061 First Contact - Re-initialization 2022-06-29 13:37:14 +08:00
minenice55
af07c6957f Update Editor.unity 2022-06-28 18:55:28 -04:00
minenice55
2be7b9c9b8 make game selection scroll not suck 2022-06-28 18:51:19 -04:00
minenice55
d8dbd1f44c tempo change: clamp on scroll 2022-06-28 16:58:23 -04:00
minenice55
9229304c52 fix missing reference errors in tooltip 2022-06-28 16:09:41 -04:00
minenice55
2a87dd3aff fix tooltip with scaled window 2022-06-28 15:57:32 -04:00