Skip to content
This repository has been archived by the owner on Jan 13, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from HarrisonHough/develop
Browse files Browse the repository at this point in the history 
Release 1.0 for Android
  • Loading branch information
@devjacs
devjacs committed Feb 28, 2016
2 parents c86e8c3 + c0e7a4e commit 207ee37
Show file tree
Hide file tree
Showing 509 changed files with 43,389 additions and 11,101 deletions.
151 changes: 139 additions & 12 deletions TheCauldron/Assembly-CSharp-Editor.csproj
View file

Large diffs are not rendered by default.

206 changes: 206 additions & 0 deletions TheCauldron/Assembly-CSharp-firstpass.csproj
View file

Large diffs are not rendered by default.

112 changes: 108 additions & 4 deletions TheCauldron/Assembly-CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_1;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;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_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_2;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;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_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;PLATFORM_SUPPORTS_ADS_ID;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
Expand All @@ -45,6 +45,17 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorBase.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorEffect.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorTriggerProxy.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorTriggerProxy2D.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorTriggerProxyBase.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorVolume.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorVolume2D.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\AmplifyColorVolumeBase.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\Runtime\VersionInfo.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\Runtime\VolumeEffects.cs" />
<Compile Include="Assets\AmplifyColor\Plugins\Runtime\VolumeEffectsFlags.cs" />
<Compile Include="Assets\Asset Store\Game Jam Menu Template\Scripts\DontDestroy.cs" />
<Compile Include="Assets\Asset Store\Game Jam Menu Template\Scripts\EventSystemChecker.cs" />
<Compile Include="Assets\Asset Store\Game Jam Menu Template\Scripts\Pause.cs" />
Expand Down Expand Up @@ -120,27 +131,120 @@
<Compile Include="Assets\Scripts\Menu.cs" />
<Compile Include="Assets\Scripts\MenuPotion.cs" />
<Compile Include="Assets\Scripts\SoupColor.cs" />
<None Include="Assets\AmplifyColor\Resources\Preview.shader" />
<None Include="Assets\Standard Assets\Effects\GlassRefraction\Shaders\GlassStainedBumpDistort.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" />
<None Include="Assets\Cardboard\Resources\SkyboxMesh.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderRGB.shader" />
<None Include="Assets\Standard Assets\Effects\ToonShading\Shaders\ToonBasic.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\SeparableWeightedBlurDof34.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ShowAlphaChannel.shader" />
<None Include="Assets\Cardboard\Distortion\CardboardDistortion.cginc" />
<None Include="Assets\AmplifyColor\Textures\Preview\ImageCC.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\SunShaftsComposite.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionCurves.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ScreenSpaceAmbientObscurance.shader" />
<None Include="Assets\AmplifyColor\Resources\MaskBlend.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\NFAA.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ScreenSpaceRaytrace.cginc" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\TiltShiftHdrLensBlur.shader" />
<None Include="Assets\Asset Store\SimplePhysicalShader\SimplePhysicalShaderRetro.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\VignetteShader.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\DepthOfFieldScatter.shader" />
<None Include="Assets\Standard Assets\Effects\TessellationShaders\Shaders\BumpedSpecularSmooth.shader" />
<None Include="Assets\Standard Assets\Effects\Projectors\Guidelines.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\MotionBlur.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MobileBloom.shader" />
<None Include="Assets\Cardboard\Resources\UnlitTexture.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\MinMaxReduction.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\SSAA.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\RadialBlur.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\DepthOfFieldDX11.shader" />
<None Include="Assets\OVR\Moonlight\Shaders\OVRColorRampAlpha.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ContrastComposite.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset3.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\FisheyeShader.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Apply.shader" />
<None Include="Assets\AmplifyColor\Resources\Blend.shader" />
<None Include="Assets\AmplifyColor\Resources\BlendCache.shader" />
<None Include="Assets\Asset Store\SimplePhysicalShader\SimplePhysicalShader.shader" />
<None Include="Assets\AmplifyColor\Resources\Mask.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\frag_ao.cginc" />
<None Include="Assets\Standard Assets\Effects\ToonShading\Shaders\ToonBasicOutline.shader" />
<None Include="Assets\OVR\Moonlight\Shaders\Unlit Crosshair.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\DepthOfField34.shader" />
<None Include="Assets\OVR\Moonlight\Resources\Unlit Transparent Color.shader" />
<None Include="Assets\AmplifyColor\Readme.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MobileBlur.shader" />
<None Include="Assets\AmplifyColor\Readme-LUTPack.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\SSAOShader.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ConvertDepth.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionCurvesSimple.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderYUV.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\CreaseApply.shader" />
<None Include="Assets\Asset Store\Game Jam Menu Template\Fonts\OpenSans\License!.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ChromaticAberrationShader.shader" />
<None Include="Assets\Plugins\Android\AndroidManifest.xml" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\GlobalFog.shader" />
<None Include="Assets\Standard Assets\Effects\ToonShading\Shaders\ToonLitOutline.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Luminance.shader" />
<None Include="Assets\Standard Assets\Effects\ToonShading\Shaders\ToonLit.shader" />
<None Include="Assets\AmplifyColor\Resources\ProcessOnly.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionSelective.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\Bokeh34.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\CameraMotionBlurDX11.shader" />
<None Include="Assets\Asset Store\SimplePhysicalShader\SimplePhysicalShaderCoat.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\SeparableBlurPlus.shader" />
<None Include="Assets\Standard Assets\Effects\Projectors\Shaders\ProjectorLight.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MultiPassHollywoodFlares.shader" />
<None Include="Assets\AmplifyColor\Resources\DepthMask.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\BlurEffectConeTaps.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\CameraMotionBlur.shader" />
<None Include="Assets\AmplifyColor\Resources\Common.cginc" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\DLAA.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter2.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\SeparableBlur.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\MotionBlurClear.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionEffect.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\GrayscaleEffect.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\SepiaToneEffect.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\TwirlEffect.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\VortexEffect.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Adaptation.shader" />
<None Include="Assets\AmplifyColor\Resources\DepthMaskBlend.shader" />
<None Include="Assets\AmplifyColor\Resources\Base.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrain.shader" />
<None Include="Assets\Standard Assets\Effects\Projectors\Shaders\ProjectorMultiply.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\VignettingShader.shader" />
<None Include="Assets\Cardboard\Resources\UI\CardboardReticleShader.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\Tonemapper.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA2.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrection3DLut.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\LensFlareCreate.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\EdgeDetectNormals.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\PrepareSunShaftsBlur.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\Blend.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\BlendModesOverlay.shader" />
<None Include="Assets\Cardboard\Resources\SolidColor.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\SimpleClear.shader" />
<None Include="Assets\Asset Store\Game Jam Menu Template\GameJamTemplateReadMe.txt" />
<Reference Include="UnityEngine.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<None Include="Assets\Standard Assets\Effects\TessellationShaders\Shaders\BumpedSpecularDisplacement.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA3Console.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset2.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{12F8B266-CCBD-8AC2-01D4-3820EDE4347E}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
9 changes: 9 additions & 0 deletions TheCauldron/Assets/AmplifyColor.meta
View file

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

9 changes: 9 additions & 0 deletions TheCauldron/Assets/AppIcons.meta
View file

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

Binary file added TheCauldron/Assets/AppIcons/CauldronIcons.zip
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons.zip.meta
View file

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

9 changes: 9 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2.meta
View file

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

Binary file added TheCauldron/Assets/AppIcons/CauldronIcons2.zip
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2.zip.meta
View file

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

9 changes: 9 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2/android-old.meta
View file

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

9 changes: 9 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-hdpi.meta
View file

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

Binary file added TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-hdpi/ic_launcher.png.meta
View file

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

9 changes: 9 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-ldpi.meta
View file

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

Binary file added TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-ldpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-ldpi/ic_launcher.png.meta
View file

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

9 changes: 9 additions & 0 deletions TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-mdpi.meta
View file

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

Binary file added TheCauldron/Assets/AppIcons/CauldronIcons2/android-old/mipmap-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 207ee37

Please sign in to comment.