Commit graph

483 commits

Author SHA1 Message Date
minenice55
b04cf9d00e Merge pull request #143 from minenice55/karate-man-2
WIP Karate Man Rework
2022-08-09 11:51:26 -04:00
minenice55
6297980922 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
9d6349f7b2 Merge branch 'master' into pr/140 2022-08-09 10:20:59 -04:00
minenice55
f6b3a7fce5 improve feedback on combo finish out 2022-08-07 20:24:07 -04:00
minenice55
9e3c90c093 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
d36111cef6 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
5f8899008d background colour fading
- also allows fading of shadow and background texture colours
2022-08-06 19:15:44 -04:00
minenice55
c9cffb15c2 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
bdc9900099 background particles, gradient 2022-08-05 21:19:18 -04:00
minenice55
55b0377680 recolourable shadows
- rework now has parity with the old version
2022-08-03 18:55:13 -04:00
minenice55
795fdf61d2 background effects, special move camera
- also removed all old karate man assets
2022-08-03 17:49:32 -04:00
minenice55
f2fedaf197 finish effect 2022-08-03 16:14:37 -04:00
minenice55
e49d9f0db5 kicks complete, start work on particles
- bg colour can now be changed
2022-07-30 21:16:48 -04:00
minenice55
996354946a hit effect start, kick charge 2022-07-29 22:25:48 -04:00
minenice55
28b5cc71d7 start work on kicks 2022-07-29 15:26:59 -04:00
minenice55
a1f7b0ea42 replace old karate man prefab with new one 2022-07-29 15:06:22 -04:00
minenice55
41d098ec1d add y-offset functionality to start position offset 2022-07-29 12:52:59 -04:00
minenice55
d478a55795 fully functional combo, several object types 2022-07-29 12:18:17 -04:00
minenice55
334a654b9b combo input 2022-07-28 22:09:48 -04:00
minenice55
39d3a136c5 start working on inputs
- InputType enum is now flags, can be combined together
2022-07-28 19:12:21 -04:00
minenice55
357e0b8f47 Merge branch 'master' into karate-man-2 2022-07-28 19:09:59 -04:00
minenice55
5a2860f752 Merge pull request #139 from ThatZeoMan/master
Track 5, along with QOL changes
2022-07-28 19:09:07 -04:00
ThatZeoMan
f34624e1d8 vfx flashes work again
thanks for the help, minenice
2022-07-28 18:07:19 -05:00
ThatZeoMan
e337fe650e Track 5 fully functional
also fixed karate man's Set Background Effects
2022-07-28 17:16:20 -05:00
minenice55
b85754c6d7 Merge branch 'master' into karate-man-2 2022-07-28 11:32:10 -04:00
minenice55
c45f0a34dc create classes 2022-07-27 18:35:18 -04:00
Mytiaoga
4a795d96f0 Update repo to latest 2022-07-27 17:04:02 +08:00
ThatZeoMan
9bca79b2a0 Update TramAndPauline.cs 2022-07-26 18:19:05 -05:00
ThatZeoMan
2f87a8edcb Merge branch 'megaminerjenny:master' into master 2022-07-26 19:05:32 -04:00
adianfiuef
8fca08c088 Tram&Pauline animation update 2022-07-26 14:14:28 -04:00
adianfiuef
34a12a514c Tram&Pauline
Animation mostly done perfectly
2022-07-25 01:04:16 -07:00
Mytiaoga
c7b8404a6a Merge branch 'master' of https://github.com/Mytiaoga/HeavenStudio 2022-07-25 10:09:25 +08:00
Mytiaoga
2ca9cbbb1d 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
36a40ed74f Add files via upload 2022-07-25 10:03:01 +08:00
Mytiaoga
2e4e20a85a Add files via upload 2022-07-25 10:02:33 +08:00
minenice55
96ac465200 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
Mytiaoga
167889d2e2 First Contact - Fixed bug for [lookAt] 2022-07-11 16:55:35 +08:00
Mytiaoga
2441d624dc First Contact - Toggle Live Bar beat
- On beat or Off beat live bar
2022-07-11 15:38:34 +08:00
Mytiaoga
667234a855 First Contact - slight change on Mission Control 2022-07-11 15:21:17 +08:00
Mytiaoga
8caa566890 First Contact - Revert Offbeat to OnBeat Live 2022-07-11 14:06:30 +08:00
Mytiaoga
06f80bfb51 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
ThatZeoMan
98c4b6d425 Unified minigame titles 2022-07-09 22:02:59 -05:00
ThatZeoMan
f59a3ed04f Further simplified Coin Toss
Also added 3 new color attributes: colorD, colorE, and colorF
2022-07-09 21:42:28 -05:00
ThatZeoMan
51c0eb0725 Combined Coin Toss's "Set XXXXground color" into one
also renamed "Hit3" to "HitX"
2022-07-09 21:20:30 -05:00
Mytiaoga
311bda5fd3 Updated Inputs for some minigames
First Contact & DJ School has their inputs methods updated
2022-07-08 13:27:10 +08:00
Mytiaoga
38cb7049fa First Contact - Updated Input Manager
Also changed the game icon w/ mask
2022-07-03 16:42:18 +08:00
Mytiaoga
8177507642 First Contact - Re-initialization 2022-06-29 13:37:14 +08:00
minenice55
8195b1fc88 Pajama Party: no awake can be interrupted by other cues 2022-06-26 00:16:37 -04:00
minenice55
2cf836b2ca trim Trick on the Class sfx, fix Pajama party sprites 2022-06-25 23:38:40 -04:00
minenice55
cb0d903b51 Merge pull request #117 from minenice55/game-mobTrick
Minigames: Trick on the Class & Rhythm Somen
2022-06-24 01:20:43 -04:00
minenice55
0019c84ee8 Game scroll and other adjustments
add icons to Rhythm Somen, Trick on the Class
adjust bg colour of Rhythm Tweezers, Karate Man
2022-06-24 00:51:22 -04:00
saladplainzone
05cd5b514f Rhythm Somen - Done Except Eating But I'm Fine With It For Now 2022-06-23 23:22:06 -04:00
saladplainzone
2289eb6f0b Rhythm Somen - Basic Setup, Cues
No inputs yet, but I figure this is big enough I can push it just to be safe
2022-06-23 23:20:43 -04:00
minenice55
101e2eb251 Trick on the Class: basic functionality complete 2022-06-23 21:28:17 -04:00
huantian
57e72611c9 Fix ScheduleInput docstring (#114) 2022-06-23 17:05:27 -07:00
huantian
49d949be1e Fix Tram and Pauline file locations (#113) 2022-06-23 17:05:19 -07:00
minenice55
642842bbaa Trick on the Class: player / girl animations done 2022-06-22 18:42:22 -04:00
minenice55
3a9af801ec Trick on the Class: update 2mo old code 2022-06-19 22:29:21 -04:00
minenice55
ed79c7e4fd Merge branch 'master' into game-mobTrick 2022-06-19 21:47:42 -04:00
minenice55
ae017fdeef Various small additions and changes (#105)
* Fan Club: spotlight effects

* new icons for Pajama Party, Karate Man

* Editor: make context use Rodin font

* idem for entities

* Blue Bear: import HQ texture

* Pajama Party: option to sleep forever

* Space Soccer: option to mute the dispense sound
2022-06-17 23:31:19 -07:00
minenice55
b660b4dcbd Allow games to load assets from AssetBundles (#102)
* Loading improvements: prepwork for loading from assetbundles

* note for sfx

* cleaner code

* correct type

* put loaded assetbundle in the minigame data instead

also lays groundwork for future localization stuff

* add samurai slice gold, coin toss assetbundles

* very messy "already loaded" checks

* make Dj School load from assetbundle
2022-06-12 12:32:00 -07:00
Jellirby
b15a4c6f0c Launch Party Prefab Setup (#97)
This commit includes all the necessary things to get started with Launch Party (base color sprites, prefab, background, and a loader class script). Anyone is welcome to finish it
2022-06-10 09:50:39 -07:00
minenice55
37eb45ec6d Small Bugfixes (#95)
* Fix Sheets issue 11

* Textboxes: Fix unicode glyphs sometimes not displaying

* Fan Club: fix order of operation bug

* Conductor: refactor ReportBeat

this fixes issues with using crop stomp alongside tempo changes

* Built to Scale (Gold): temporarily disable post-processing

game renders very incorrectly due to the post processing effects
will need someone who knows what they're doing in that field to fix it proper

* marked some assets for deletion

* I'm dumb and left in debug prints
2022-06-08 20:35:15 -07:00
minenice55
a3fb579c6d Animation speed helpers, stop on remix end (#91) 2022-06-06 09:54:49 -07:00
minenice55
057bdf7fe5 Gameplay: Timing windows use a "smart" BPM scaling system (#86)
* Game: Pajama Party

* Pajama Party: bg setup, Mako jump

* Pajama Party: mako jumping

* Pajama Party: prep landing anim references

* Pajama Party: several anims, improved 3d scene

* Pajama Party: bg cleanup

* Pajama Party: Mako sleeping anims

* Pajama Party: All Mako anims, add sounds to fs

* Pajama Party: prep monkey prefab

* Pajama Party: thrown pillow, prep sequences

* Pajama Party: make embarrassed catch not loop

whoops

* Pajama Party: sound adjust, prefab work

* Pajama Party: monkey spawning, basic jumping

* Pajama Party: jump sequence

no input detection or landing yet

* Pajama Party: anims override

* Pajama Party: jump cue functional

comes with improvements and bugfixes to PlayerActionEvent

* Pajama Party: sleep cue functional

* Pajama Party: some notes

* PlayerActionEvent: more bugfixes

* Pajama Party: fully functional throw cue

* Pajama Party: start animating sleep cue

* Pajama Party: feature-complete

* Pajama Party: unfuck layering

* Pajama Party: icon

also adds Fan Club's concept icon

* Pajama Party: cues while unloaded

* inverse-scale timing windows based on speed

* Fan Club: move to new input system

* Fan Club: allow forced animations during calls

* Crop Stomp: fix camera shake regression
2022-06-03 20:15:56 -07:00
minenice55
fc07f80b4f Feature: Textboxes and other text-related features (#90)
* Textboxes: setup prefab

* Textboxes: basic functionality finished

* Textbox: scaling

* Textbox: open captions

* Textbox: res edits

* Textbox: song artist

* Textbox: closed captions

* Textbox: fix not being able to use multiple text events

* I/O: save / load remixes using UTF-8 encoding

* Textboxes: stop editor shortcuts while typing
2022-06-03 20:15:05 -07:00
minenice55
022cbad1d6 Minigame: Pajama Party (#84)
* Game: Pajama Party

* Pajama Party: bg setup, Mako jump

* Pajama Party: mako jumping

* Pajama Party: prep landing anim references

* Pajama Party: several anims, improved 3d scene

* Pajama Party: bg cleanup

* Pajama Party: Mako sleeping anims

* Pajama Party: All Mako anims, add sounds to fs

* Pajama Party: prep monkey prefab

* Pajama Party: thrown pillow, prep sequences

* Pajama Party: make embarrassed catch not loop

whoops

* Pajama Party: sound adjust, prefab work

* Pajama Party: monkey spawning, basic jumping

* Pajama Party: jump sequence

no input detection or landing yet

* Pajama Party: anims override

* Pajama Party: jump cue functional

comes with improvements and bugfixes to PlayerActionEvent

* Pajama Party: sleep cue functional

* Pajama Party: some notes

* PlayerActionEvent: more bugfixes

* Pajama Party: fully functional throw cue

* Pajama Party: start animating sleep cue

* Pajama Party: feature-complete

* Pajama Party: unfuck layering

* Pajama Party: icon

also adds Fan Club's concept icon

* Pajama Party: cues while unloaded
2022-05-27 19:40:16 -07:00
minenice55
4ace832a11 Global Camera Movement (#80)
* Global Camera: move Spaceball to new system

* Global Camera: holy shit I'm done already?????
2022-05-15 22:29:39 -07:00
minenice55
2453f9a48b Minigame: Samurai Slice (Gold) (#79)
* Game: Samurai Slice (DS)

initial scene setup

* Samurai Slice (Gold) - Start animations

* Samurai Slice (Gold) - Finish core samurai animations

* Samurai Slice (Gold) - Basic interactions

* Samurai Slice (Gold): object prep

* Samurai Slice (Gold): object type setup

* Samurai Slice (Gold): object paths

* Samurai Slice (Gold): prep for other objects

* Samurai Slice (Gold): prep fish

* Samurai Slice (Gold): Objects complete

* Samurai Slice (Gold): dinero

quiero cien vbucks

* Samurai Slice (Gold): polish cash, slicing anim

* Samurai Slice (Gold): child catching

* Samurai Slice (Gold): feature complete
2022-05-15 22:29:26 -07:00
Jenny Crowe
60b5602050 Merge branch 'master' into master 2022-05-07 14:28:49 -07:00
Jenny Crowe
784b9e886e Merge pull request #76 from Pengu12345/alternate_input_system
Separation of input detection in it's own class + Addition of Coin Toss
2022-05-07 14:19:15 -07:00
Jenny Crowe
e164c66439 Merge pull request #77 from freeformfunposting/master
(minor) Fix for a sound error with Autoplay in Spaceball
2022-05-07 14:18:04 -07:00
Stef Jenkins
fd8c4fd047 Fixed a sound error with Autoplay 2022-05-06 15:14:01 -07:00
Pengu123
4bd1dd92cc Clean up the debug messages 2022-05-06 22:30:17 +02:00
Pengu123
6d92ded6a6 Background control in Coin Flip 2022-05-06 22:23:52 +02:00
Pengu123
71bbefb764 Cleanup + new Shedule methods 2022-05-06 22:05:19 +02:00
Pengu123
0b79779b9b More comments, new method to detect expected inputs
IsExpectingInputNow() detects wether the player is expected to input something at the closest InputEvent
2022-05-04 20:37:52 +02:00
Pengu123
5cdd044154 Added a list to keep track of all the scheduled inputs of a minigame
...Along with an Util function to return the closest scheduled input
2022-05-04 20:05:51 +02:00
Pengu123
defd64a56e noAutoplay and autoplayOnly settings
Would be especially useful for menial optional inputs like the offbeat parts of flockstep
2022-05-04 19:21:11 +02:00
Pengu123
ba8d2132ce Added Support for specific direction inputs
Added some comments on the PlayerInput class too for clarity
2022-05-04 18:42:06 +02:00
Pengu123
70a69a7c91 Fixed Input bugs + Optimizations
-- On the PlayerInput class --
FIXED: Bug where Directions input were still recorded even with autoplay on
OPTIMIZED: Moved the conditions wether player had control in it's own method so we can re-use the same condition on new methods
2022-05-04 18:05:05 +02:00
Pengu123
d41eaac105 ScheduleInput Method added, tests awaiting 2022-05-03 22:36:55 +02:00
minenice55
78594345b6 Fan Club: fast kamone plays when scene is unloaded 2022-05-02 16:16:00 -04:00
minenice55
278d2773f7 Fan Club: unarranged sequel feature-complete 2022-05-02 13:43:47 -04:00
minenice55
6cfd3d9fda Fan Club: particle stuff, unarranged crouch / kiss 2022-05-02 11:45:48 -04:00
minenice55
2eff834a7a Fan Club: arranged landing, corrected texture atlas colours 2022-05-01 20:08:48 -04:00
Pengu123
6bf5be2e5b Bug Fixing 2022-05-02 00:24:07 +02:00
Pengu123
b7ba06c812 Coin Toss Done. Needs HD Textures and more customization 2022-05-01 23:49:55 +02:00
Pengu123
6083e07535 Coin Toss Functionnal (Needs Miss and Blank animation) 2022-05-01 22:10:00 +02:00
Pengu123
0232fe5540 Throw and Catch animation 2022-05-01 20:22:00 +02:00
minenice55
c8e7bb1292 Fan Club: cont. unarranged sequel work 2022-04-30 01:20:19 -04:00
minenice55
b41c97b6c7 Fan Club: more work on unarranged sequel 2022-04-30 00:36:47 -04:00
minenice55
97df0a43cf Fan Club: initial support for "unarranged" sequel 2022-04-28 17:56:00 -04:00
minenice55
dbdc3d44ae Fan Club: various adjustments
address input lockout (still has one minor issue I need to check)
make certain forced animations make more sense
2022-04-28 16:01:07 -04:00
minenice55
c1ea34dc8d Fan Club: add fast kamone 2022-04-27 18:02:53 -04:00
minenice55
a882f45ebd Trick on the Class: new minigame definition 2022-04-13 10:14:13 -04:00
minenice55
fda9f3612d Merge branch 'master' into game-mobTrick 2022-04-13 10:12:47 -04:00
minenice55
b0637a1281 Internal: fixed duplicated game defs 2022-04-12 17:49:00 -04:00
minenice55
1f0187ee66 Internal: separate minigame definitions 2022-04-12 12:14:46 -04:00
minenice55
293ed09127 Trick on the Class: refactor object sound 2022-04-11 10:57:27 -04:00
minenice55
8f905535ba Trick on the Class: prep bop entity 2022-04-11 09:56:37 -04:00
adianfiuef
490e0a25dc Tram&Pauline 2022-04-11 02:05:43 -07:00
minenice55
d102d1baa2 Trick on the Class: basic gameplay with placeholders 2022-04-10 21:05:33 -04:00
minenice55
0ee7e73a0c Trick on the Class: object rotation 2022-04-10 19:15:59 -04:00
minenice55
035d3f4fce Trick on the Class: flying objects 2022-04-10 18:29:31 -04:00
minenice55
ddc6b84063 Trick on the Class: object paths 2022-04-10 17:37:37 -04:00
minenice55
30d23ea309 Trick on the Class: initial setup
hell
2022-04-04 10:48:37 -04:00
Jenny Crowe
8c0a79255c Merge pull request #66 from minenice55/more-ntrIdol-2
Fan Club: bugfixes and additions
2022-03-28 11:55:18 -07:00
minenice55
dc3e7aadbd Correct compilation errors from merge 2022-03-28 09:45:16 -04:00
minenice55
24765c3d68 Merge branch 'master' into more-ntrIdol-2 2022-03-28 09:43:55 -04:00
Slaith
71e4e9c1f6 Fixed barrel break not working 2022-03-27 18:23:59 -07:00
minenice55
6bbbabf7f6 Fan Club: more animations 2022-03-27 19:05:08 -04:00
Slaith
8960d9da55 Allowed lion count and mii faces to be set before game switches and fixed some bugs from last pr
I went through every single game script to look for bugs in intialization, there shouldn't be anything else that was caused by the pr (there is a bug in Spaceball where a ball cue won't trigger correctly if it's on the same beat as the switch, but i'm not sure how to fix it)
2022-03-27 11:13:13 -07:00
Jenny Crowe
a1527d58b6 Blue Bear: Crumbs! (Also fixed animation bugs associated with a recent PR) 2022-03-27 05:08:26 -07:00
minenice55
bf172ca17e Fan Club: idol squatting animation 2022-03-27 00:11:32 -04:00
Slaith
1c9331daf8 fixing another bug with clappy trio 2022-03-26 17:53:34 -07:00
Slaith
b9c02eb039 i'm dumb lol 2022-03-26 17:42:50 -07:00
Jenny Crowe
abf86b4258 Merge pull request #63 from Slaith12/main
Prevented out of order initialization
2022-03-25 21:48:51 -07:00
minenice55
7c591e0a11 Fan Club: arisa jump 2022-03-25 22:45:54 -04:00
Slaith
a653194e07 Moved all minigame initialization to Awake()
I just moved everything that was in start to awake. There are a few other changes I made, like using init functions rather than awake in scripts that depended on something that was initialized in another script's awake (to make sure things always happen in the right order), as well as some other stuff in some specific minigames
2022-03-25 19:08:46 -07:00
minenice55
831b019735 Fan Club: root motion 2022-03-25 18:59:18 -04:00
minenice55
61aaea72d9 Fan Club: fix references 2022-03-25 18:51:43 -04:00
minenice55
173e9d80dd Fan Club: note to self 2022-03-22 15:49:29 -04:00
minenice55
d13d547c89 Merge branch 'master' into more-ntrIdol-2 2022-03-22 15:28:44 -04:00
minenice55
6d857e9d5c Fan Club: prepare Arisa jumping 2022-03-22 15:23:55 -04:00
minenice55
5d95c9ec16 Conductor: property that returns secPerBeat scaled to song pitch
NEEDS TESTING
2022-03-22 14:29:15 -04:00
minenice55
04535747f7 Fan Club: fix forcing idol anims during responses 2022-03-21 11:29:24 -04:00
minenice55
d768f48eae Fan Club: address issue with double clap -> I suppose stack 2022-03-21 11:23:42 -04:00
minenice55
7d580fb132 oops forgot a small thing
includes example using a fan club sound
2022-03-20 19:58:37 -04:00
Jenny Crowe
c406f30f77 Merge pull request #57 from Slaith12/main
Fixed space soccer ball spawning when it shouldn't be
2022-03-18 18:42:31 -07:00
Slaith
a577544fac Fixed space soccer ball spawning when it shouldn't be
The soccer ball that is part of the prefab no longer defaults to the Dispensing state (when i refactored the ball script a while ago, i dealt with this problem by just disabling that ball, but this solution should work even with the ball enabled)
2022-03-17 18:44:58 -07:00
minenice55
dc46781d40 Fan Club: landing sound 2022-03-17 17:01:26 -04:00
minenice55
65918bd950 Fan Club: add cues continuing from transition, muted cues 2022-03-17 16:43:35 -04:00
minenice55
bce671dc85 Fan Club: make forced animations properly restart 2022-03-17 15:18:40 -04:00
minenice55
3e28dbcb0a Fan Club: refactoring, fixes 2022-03-17 15:13:48 -04:00
minenice55
cd00c13fa7 Fan Club: remove unused file 2022-03-17 12:20:11 -04:00
Jenny Crowe
f69e69c41a Merge pull request #55 from minenice55/game-ntrIdol
Minigame: Fan Club
2022-03-16 16:22:10 -07:00
minenice55
4df6dcacd6 Fan Club: fix forced "peace no sync" animation 2022-03-16 17:45:12 -04:00
minenice55
b73135196c Fan Club: add particle effect to forced clap 2022-03-16 17:43:37 -04:00
minenice55
af6e60a247 Fan Club: finish all basic functionality
todo: other "special" animations
2022-03-16 17:41:46 -04:00
Jenny Crowe
e82f2096e9 Crop Stomp: Minor visual tweaks 2022-03-16 02:53:30 -07:00
Carson Kompon
79ddcffdd8 Added Streaks and Set Background Color to Drumming Practice 2022-03-15 19:15:54 -04:00
minenice55
5f42dd4f00 Fan Club: actual functionality (input still bugged) 2022-03-15 18:43:13 -04:00
minenice55
57e075255b Fan Club: like 50% of the game lmao 2022-03-14 20:54:54 -04:00
minenice55
407ccdface Fan Club: update script to new namespace 2022-03-14 10:36:19 -04:00
minenice55
df068c3899 Merge branch 'master' into game-ntrIdol 2022-03-14 10:35:33 -04:00
minenice55
b7c814738d Fan Club: more idol stuff 2022-03-14 10:35:04 -04:00
Jenny Crowe
2d80cb05b1 The biggest of boi refactors 2022-03-14 07:21:05 -07:00
minenice55
0479cb39f8 Fan Club: idol setup part 1 2022-03-13 18:23:38 -04:00
minenice55
9d50231c2c Merge branch 'master' into game-ntrIdol 2022-03-13 12:50:17 -04:00