Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
5037583
Added new test minigame, button moves
RoboticWater Sep 15, 2019
ef15ceb
Added Skiles Walkway Minigame
MGPAlpha Sep 16, 2019
6475118
Added basic movement and side-scrolling to 'Skiles Walkway'
MGPAlpha Sep 17, 2019
afa1337
Added basic enemy waving hand at player
MGPAlpha Sep 17, 2019
9fa64e8
Lengthened SkilesWalkway field and made the enemy better at detectign…
MGPAlpha Sep 17, 2019
15fc70d
Added new enemy that throws flyers
MGPAlpha Sep 18, 2019
a325bac
Merge branch 'master' into SkilesWalkway
MGPAlpha Oct 2, 2019
a572715
Merge from upstream
MGPAlpha Oct 23, 2019
8aacc70
setting up audio stuff and more menu-y ui updates
rhiannanberry Oct 23, 2019
d0d56ac
dddd
rhiannanberry Nov 1, 2019
120bfd6
Merge branch 'master' into SkilesWalkway
NicoBartholomai Nov 2, 2019
999d4d8
Added SkilesWalkway dude sprites
NicoBartholomai Nov 2, 2019
acbc352
SkilesWalkway: added player sprites and animation state machine
NicoBartholomai Nov 2, 2019
4aa7a98
SkilesWalkway: added strafing and spinning throwers
MGPAlpha Nov 7, 2019
bd16862
Merge branch 'master' into SkilesWalkway
MGPAlpha Nov 7, 2019
7b1f792
SkilesWalkway: Added Strafing handout enemy and modified some enemy s…
MGPAlpha Nov 7, 2019
44dc57b
SkilesWalkway: Fixed strafing range
NicoBartholomai Nov 7, 2019
e91175a
Added table images
NicoBartholomai Nov 8, 2019
e70c6e9
SkilesWalkway: Made level and added club tables
MGPAlpha Nov 8, 2019
f5f064d
Added SkilesWalkway to Build
MGPAlpha Nov 8, 2019
cf49a5c
Working on materials
rhiannanberry Nov 8, 2019
d7503ac
Skiles Walkway: Added enemy and floor sprites
NicoBartholomai Nov 9, 2019
5c173fe
Merge remote-tracking branch 'origin/SkilesWalkway' into SkilesWalkway
NicoBartholomai Nov 9, 2019
d1788cd
Skiles Walkway: Updated floor tile to make lighter
NicoBartholomai Nov 9, 2019
850a8a6
Skiles Walkway: Added arm enemy Sprite
NicoBartholomai Nov 9, 2019
80cb236
Skiles Walkway: Added T-Posing enemy sprite
NicoBartholomai Nov 9, 2019
84560cf
Skiles Walkway: Added a tree sprite
NicoBartholomai Nov 9, 2019
acf6262
SkilesWalkway: Added assets and animations
MGPAlpha Nov 9, 2019
5648def
Merge remote-tracking branch 'upstream/master' into SkilesWalkway
NicoBartholomai Nov 9, 2019
ae3a5c7
Finally getting happy with some shaders and texs
rhiannanberry Nov 9, 2019
4122af7
flavor text
rhiannanberry Nov 9, 2019
b88514d
Sandtrap!!!
rhiannanberry Nov 10, 2019
ef9bc37
Skiles Walkway: Fixed script on throwing characters so now they will …
NicoBartholomai Nov 10, 2019
ae4b50c
Fixed some files I accidentally modified
MGPAlpha Nov 10, 2019
fb9128e
Merge pull request #10 from rhiannanberry/roll
rhiannanberry Nov 10, 2019
71e1fdb
Merge branch 'master' of https://github.com/RhiannanBerry/Minigames
rhiannanberry Nov 10, 2019
5bb12b9
SkilesWalkway: Fixed camera on edge
MGPAlpha Nov 10, 2019
ab21034
Merge branch 'master' of https://github.com/rhiannanberry/Minigames i…
rhiannanberry Nov 10, 2019
4f2525b
Music installed, works with volume
rhiannanberry Nov 11, 2019
a98c8fe
Merge pull request #9 from MGPAlpha/master
rhiannanberry Nov 11, 2019
2246c6f
Merge branch 'Audio' of https://github.com/RhiannanBerry/Minigames
rhiannanberry Nov 12, 2019
d038297
Modifying minigame to fit pt 1
rhiannanberry Nov 12, 2019
e603833
Soham mods in progress (still working on audio)
rhiannanberry Nov 12, 2019
1312d8d
evidently, like every single change ever
RoboticWater Nov 14, 2019
74ec02d
merge with master
RoboticWater Nov 14, 2019
bd1010a
lives eyes are now animated
RoboticWater Nov 14, 2019
8145465
updated to latest and added main menu and ending scene art
RoboticWater Nov 14, 2019
d076def
fixed credits
RoboticWater Nov 14, 2019
1e8321b
Merge pull request #11 from RoboticWater/master
rhiannanberry Nov 15, 2019
40b8c10
importing games
rhiannanberry Nov 16, 2019
74907e5
Fixing scene field on scriptable objects
rhiannanberry Nov 16, 2019
feec620
Music manager. Renaming and moving things bc i hate writing music man…
rhiannanberry Nov 16, 2019
c7a813f
Debug stuff and more clean up
rhiannanberry Nov 16, 2019
57e6b09
More renaming and organizing
rhiannanberry Nov 17, 2019
9020881
more refactoring. SFX works now
rhiannanberry Nov 17, 2019
1993fdc
mech minigame + fixed eyes on transition screen
RoboticWater Nov 17, 2019
f1ff697
Still refactoring and adding sound affects, bare with me everyone
rhiannanberry Nov 17, 2019
5f9b889
Doing workflow stuff
rhiannanberry Nov 18, 2019
4ef9cac
Fixed eyeballs, cleaning up warnings
rhiannanberry Nov 18, 2019
542738a
Merge branch 'master' of https://github.com/RoboticWater/GameGameGame…
rhiannanberry Nov 18, 2019
3c14719
Merge branch 'RoboticWater-master'
rhiannanberry Nov 18, 2019
ae3d809
Merge branch 'master' of https://github.com/RhiannanBerry/Minigames i…
rhiannanberry Nov 18, 2019
94738d2
merge + fix mech
Nov 18, 2019
eda3b03
merge
Nov 18, 2019
114bb3e
added switchboard minigame
RoboticWater Nov 18, 2019
e0ce072
audio managers take into account normalization volume
rhiannanberry Nov 18, 2019
4f97181
Roller Madness 1 functional
rhiannanberry Nov 18, 2019
4d7cb99
Roller Madness 2 formatted
rhiannanberry Nov 18, 2019
ff09c57
Working on run over scene
rhiannanberry Nov 18, 2019
6a2133a
Merge branch 'master' of https://github.com/RoboticWater/GameGameGame…
rhiannanberry Nov 19, 2019
7156092
Merge branch 'RoboticWater-master'
rhiannanberry Nov 19, 2019
536c979
finicking with ui
rhiannanberry Nov 20, 2019
e2303a4
UI
rhiannanberry Nov 20, 2019
62defe1
ui almost done, most games converted, working on audio and credits
rhiannanberry Nov 20, 2019
6411230
fixed mech
RoboticWater Nov 20, 2019
37a9e55
merge
RoboticWater Nov 20, 2019
73aba14
removd unecessary stuff + fixed references
RoboticWater Nov 20, 2019
cb4da35
jk, I fixed the references in this one
RoboticWater Nov 20, 2019
1fa81d4
Merge pull request #15 from RoboticWater/master
rhiannanberry Nov 20, 2019
c3a7c4a
Credits p1
rhiannanberry Nov 20, 2019
98e1298
Merge branch 'master' of https://github.com/rhiannanberry/Minigames
rhiannanberry Nov 20, 2019
e9d7d35
demo edits
rhiannanberry Jul 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
98 changes: 98 additions & 0 deletions .idea/.idea.Minigames/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions Assets/AdditiveSceneTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;

public class AdditiveSceneTest : MonoBehaviour
{
[Scene] public string game;
void Awake() {
Camera.main.gameObject.SetActive(false);
SceneManager.LoadScene(game, LoadSceneMode.Additive);
}
// Start is called before the first frame update
void Start()
{

}

// Update is called once per frame
void Update()
{

}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Assets/JMO Assets/Toony Colors.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions Assets/JMO Assets/Toony Colors/!ToonyColors Readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Toony Colors Free, version 2.0
2019/03/20
� 2019, Jean Moreno
==============================

PLEASE LEAVE A REVIEW OR RATE THE PACKAGE IF YOU FIND IT USEFUL!
Enjoy! :)

CONTACT
-------
Questions, suggestions, help needed?
Contact me at:
jean.moreno.public+unity@gmail.com

I'd be happy to see any shader used in your project, so feel free to drop me a line about that! :)


UPDATE NOTES
------------
v2.0.1
- Removed 'JMOAssets.dll', became obsolete with the Asset Store update notification system

v2.0
- new shaders based on Toony Colors Pro 2
- new demo scene

v1.41
- fixed alpha output for opaque shaders, could cause issues with RenderTextures

v1.4
- updated "JMO Assets" menu
- Unity 5 compatibility

v1.3
- changed name to "Toony Colors"

v1.2
- added JMO Assets menu (Window -> JMO Assets), to check for updates or get support

v1.1

- added Toony Gooch RimOutline Hard shader

- added 2 new toon ramp textures (3 tones lightning & soft shadow)

v1.0
- Initial Release
2 changes: 2 additions & 0 deletions Assets/JMO Assets/Toony Colors/!ToonyColors Readme.txt.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Assets/JMO Assets/Toony Colors/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

123 changes: 123 additions & 0 deletions Assets/JMO Assets/Toony Colors/Editor/TCF_MaterialInspector.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
// Toony Colors Free
// (c) 2012,2016 Jean Moreno

//Enable this to display the default Inspector (in case the custom Inspector is broken)
//(It will also remove the Toony Colors Pro 2 links)
//#define SHOW_DEFAULT_INSPECTOR

using UnityEngine;
using UnityEditor;
using System.Collections;
using System.Collections.Generic;

public class TCF_MaterialInspector : MaterialEditor
{
public override void OnInspectorGUI()
{
if(!this.isVisible)
{
return;
}

GUILayout.Label("Toony Colors Free", EditorStyles.boldLabel);

Separator();

base.OnInspectorGUI();

#if SHOW_DEFAULT_INSPECTOR
return;
#endif

GUILayout.Space(4);
SeparatorLine();

GUILayout.Label("Want more features?", EditorStyles.boldLabel);
Rect r = GUILayoutUtility.GetRect(new GUIContent("Outlines, bump, specular, transparency, sketch effect, reflection probes, mobile versions..."), EditorStyles.wordWrappedMiniLabel);
r.y -= 6;
GUI.Label(r, "Outlines, bump, specular, transparency, sketch effect, reflection probes, mobile versions...", EditorStyles.wordWrappedMiniLabel);
string color = EditorGUIUtility.isProSkin ? "#27abff" : "#0040dd";
GUILayout.Label(string.Format("Check out <b><color={0}>Toony Colors Pro+Mobile 2</color></b> and give your game the <i>ultimate stylized look</i>!", color), RichTextLabel);

GUILayout.Space(4);
EditorGUILayout.BeginHorizontal();

if(GUILayout.Button("View Web Demo", EditorStyles.miniButtonLeft))
{
Application.OpenURL(@"http://www.jeanmoreno.com/toonycolorspro/?ref=tcf");
}
if(GUILayout.Button("View on Asset Store", EditorStyles.miniButtonRight))
{
Application.OpenURL("com.unity3d.kharma:content/8105");
}

EditorGUILayout.EndHorizontal();
GUILayout.Space(4);
Separator();
GUILayout.Space(8);
}

//--------------------------------------------------------------------------------------------------
// GUI Utilities

static public GUIStyle _LineStyle;
static public GUIStyle LineStyle
{
get
{
if(_LineStyle == null)
{
_LineStyle = new GUIStyle();
_LineStyle.normal.background = EditorGUIUtility.whiteTexture;
_LineStyle.stretchWidth = true;
}

return _LineStyle;
}
}

static public GUIStyle _RichTextLabel;
static public GUIStyle RichTextLabel
{
get
{
if(_RichTextLabel == null)
{
_RichTextLabel = new GUIStyle(EditorStyles.wordWrappedLabel);
_RichTextLabel.richText = true;
}

return _RichTextLabel;
}
}

static public void Separator()
{
GUILayout.Space(4);
SeparatorLine();
GUILayout.Space(4);
}

static public void SeparatorLine()
{
GUILine(new Color(.3f,.3f,.3f), 1);
GUILine(new Color(.9f,.9f,.9f), 1);
}

static public void GUILine(float height = 2f)
{
GUILine(Color.black, height);
}
static public void GUILine(Color color, float height = 2f)
{
Rect position = GUILayoutUtility.GetRect(0f, float.MaxValue, height, height, LineStyle);

if(Event.current.type == EventType.Repaint)
{
Color orgColor = GUI.color;
GUI.color = orgColor * color;
LineStyle.Draw(position, false, false, false, false);
GUI.color = orgColor;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Assets/JMO Assets/Toony Colors/Shaders 2.0.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading