Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Intro Scripting - More CYOA Touches
  • Loading branch information
smz11006 committed Oct 5, 2015
1 parent 2aa3d07 commit 7db2eb3
Show file tree
Hide file tree
Showing 162 changed files with 408 additions and 20 deletions.
6 changes: 0 additions & 6 deletions ChooseYourOwn/Assembly-CSharp.csproj
Expand Up @@ -47,18 +47,12 @@
<ItemGroup>
<Compile Include="Assets\ChooseYourOwn.cs" />
<Compile Include="Assets\TheDestroyer.cs" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll</HintPath>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion ChooseYourOwn/ChooseYourOwn.sln
Expand Up @@ -17,7 +17,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1
Expand Down
Binary file modified ChooseYourOwn/Library/CurrentLayout.dwlt
Binary file not shown.
Binary file modified ChooseYourOwn/Library/assetDatabase3
Binary file not shown.
Binary file not shown.
9 changes: 4 additions & 5 deletions Mouse Control/Assembly-CSharp.csproj
Expand Up @@ -5,10 +5,10 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace>
<ProjectGuid>{9A580E6D-A672-FF49-CF3B-B785B01E723B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
<AssemblyName>Assembly-CSharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand All @@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_1_3;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_WEBPLAYER;ENABLE_SUBSTANCE;WEBPLUG;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_2_0;UNITY_5_2;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_REFLECTION_BUFFERS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;UNITY_WEBPLAYER;ENABLE_SUBSTANCE;WEBPLUG;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
Expand All @@ -28,7 +28,6 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
Expand All @@ -55,8 +54,8 @@
<Reference Include="UnityEngine.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
<Reference Include="Mono.Cecil">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
Expand Down
Binary file modified Mouse Control/Library/AssetServerCacheV3
Binary file not shown.
Binary file modified Mouse Control/Library/CurrentLayout.dwlt
Binary file not shown.
Binary file modified Mouse Control/Library/ProjectSettings.asset
Binary file not shown.
Binary file modified Mouse Control/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Binary file not shown.
@@ -1,2 +1,2 @@
0000.55d3536a.0000
0000.55d3538a.0000
0000.55e0ab26.0000
0000.55e0ab44.0000
Binary file modified Mouse Control/Library/ScriptMapper
Binary file not shown.
Binary file modified Mouse Control/Library/assetDatabase3
Binary file not shown.
Binary file modified Mouse Control/Library/expandedItems
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/27/27f976cf96c861248a29f806251f348e
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/28/28b3edd329b0f9b40a3bc26a96d113ac
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/35/35cd5f7ea9ecfb744a7eefa4b3b5cdba
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/61/61fea67bd367b5745ac7f8681564dd4d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/9f/9fb9cd3031d38fa4e9063d5148ab7fc1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/cc/cc3da60ffd8403b4aace31887aa36a59
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/d4/d4eb0fa13d87c1f418cda32bd0c566d1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Mouse Control/Library/metadata/d9/d93f9d0c82cbe0647ab1ae9251139cf4
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Mouse Control/Mouse Control.sln
Expand Up @@ -17,7 +17,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1
Expand Down
Binary file modified Mouse Control/ProjectSettings/ProjectSettings.asset
Binary file not shown.
2 changes: 1 addition & 1 deletion Mouse Control/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
m_EditorVersion: 5.1.3f1
m_EditorVersion: 5.2.0f3
m_StandardAssetsVersion: 0
2 changes: 2 additions & 0 deletions Test_CYOA/Assembly-CSharp.csproj
Expand Up @@ -46,6 +46,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Scripts\Camera_Control.cs" />
<Compile Include="Assets\Scripts\HiddenRoom.cs" />
<Compile Include="Assets\Scripts\Puzzle_231.cs" />
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
Expand Down
Binary file modified Test_CYOA/Assets/CYO_Layout.unity
Binary file not shown.
Binary file added Test_CYOA/Assets/EnemyPos.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/EnemyPos.prefab.meta

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

Binary file added Test_CYOA/Assets/Health.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/Health.prefab.meta

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

Binary file added Test_CYOA/Assets/Materials/Cyan.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/Materials/Cyan.mat.meta

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

Binary file added Test_CYOA/Assets/Materials/Lime.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/Materials/Lime.mat.meta

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

Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/Materials/Materials/TomCryptic.mat.meta

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

Binary file added Test_CYOA/Assets/Materials/Red.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/Materials/Red.mat.meta

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

Binary file added Test_CYOA/Assets/Materials/TomCryptic.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 56 additions & 0 deletions Test_CYOA/Assets/Materials/TomCryptic.jpg.meta

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

Binary file added Test_CYOA/Assets/Materials/Yellow.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Test_CYOA/Assets/Materials/Yellow.mat.meta

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

0 comments on commit 7db2eb3

Please sign in to comment.