Skip to content

Commit 6f20551

Browse files
bfdevbfdev
committed
Merge branch 'master' of github.com:bfdev/bombdiff
Conflicts: Assets/Scripts/SceneManager.cs.meta Assets/Scripts/StatusLight.cs.meta
2 parents 65046c6 + cc792fb commit 6f20551

16 files changed

Lines changed: 654 additions & 0 deletions

‎Assembly-Boo-vs.booproj‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>10.0.20506</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{DEB7F7C1-D423-2358-701B-32516303C9B9}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace></RootNamespace>
12+
<AssemblyName>Assembly-Boo</AssemblyName>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<BaseDirectory>Assets</BaseDirectory>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>Temp\bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_3;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
<NoWarn>0169</NoWarn>
26+
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>Temp\bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
<NoWarn>0169</NoWarn>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="System" />
38+
<Reference Include="System.XML" />
39+
<Reference Include="System.Core" />
40+
<Reference Include="System.Xml.Linq" />
41+
<Reference Include="UnityEngine">
42+
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
43+
</Reference>
44+
<Reference Include="UnityEditor">
45+
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
46+
</Reference>
47+
</ItemGroup>
48+
<ItemGroup>
49+
<Compile Include="Assets\Shaders\NewBehaviourScript.boo" />
50+
<None Include="Assets\Materials\3D Text Shader.shader" />
51+
<None Include="Assets\Tuscany\Models\Materials\Vertex color unlit 5.shader" />
52+
<None Include="Assets\OVR\OVRImageEffects\OVRLensCorrection_CA.shader" />
53+
<None Include="Assets\OVR\OVRImageEffects\OVRLensCorrection.shader" />
54+
<None Include="Assets\OVR\Shaders\OVRGUIShader.shader" />
55+
<None Include="Assets\Plugins\donotdelete.txt" />
56+
</ItemGroup>
57+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
59+
Other similar extension points exist, see Microsoft.Common.targets.
60+
<Target Name="BeforeBuild">
61+
</Target>
62+
<Target Name="AfterBuild">
63+
</Target>
64+
-->
65+
66+
</Project>

‎Assembly-Boo.booproj‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>10.0.20506</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{DEB7F7C1-D423-2358-701B-32516303C9B9}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace></RootNamespace>
12+
<AssemblyName>Assembly-Boo</AssemblyName>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<BaseDirectory>Assets</BaseDirectory>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>Temp\bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_3;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
<NoWarn>0169</NoWarn>
26+
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>Temp\bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
<NoWarn>0169</NoWarn>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="System" />
38+
<Reference Include="System.XML" />
39+
<Reference Include="System.Core" />
40+
<Reference Include="System.Xml.Linq" />
41+
<Reference Include="UnityEngine">
42+
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
43+
</Reference>
44+
<Reference Include="UnityEditor">
45+
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
46+
</Reference>
47+
</ItemGroup>
48+
<ItemGroup>
49+
<Compile Include="Assets\Shaders\NewBehaviourScript.boo" />
50+
<None Include="Assets\Materials\3D Text Shader.shader" />
51+
<None Include="Assets\Tuscany\Models\Materials\Vertex color unlit 5.shader" />
52+
<None Include="Assets\OVR\OVRImageEffects\OVRLensCorrection_CA.shader" />
53+
<None Include="Assets\OVR\OVRImageEffects\OVRLensCorrection.shader" />
54+
<None Include="Assets\OVR\Shaders\OVRGUIShader.shader" />
55+
<None Include="Assets\Plugins\donotdelete.txt" />
56+
</ItemGroup>
57+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
59+
Other similar extension points exist, see Microsoft.Common.targets.
60+
<Target Name="BeforeBuild">
61+
</Target>
62+
<Target Name="AfterBuild">
63+
</Target>
64+
-->
65+
66+
</Project>

‎Assets/Materials/SerialText.mat‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 3
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: SerialText
10+
m_Shader: {fileID: 4800000, guid: 9a8caac139a79844b89ac46656e381e0, type: 3}
11+
m_ShaderKeywords: []
12+
m_CustomRenderQueue: -1
13+
m_SavedProperties:
14+
serializedVersion: 2
15+
m_TexEnvs:
16+
data:
17+
first:
18+
name: _MainTex
19+
second:
20+
m_Texture: {fileID: 2800000, guid: 926532bc3b570504d976c12037cae026, type: 3}
21+
m_Scale: {x: 1, y: 1}
22+
m_Offset: {x: 0, y: 0}
23+
m_Floats: {}
24+
m_Colors:
25+
data:
26+
first:
27+
name: _Color
28+
second: {r: .110294104, g: .110294104, b: .110294104, a: 1}

‎Assets/Materials/SerialText.mat.meta‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/StatusLightInactive.mat‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 3
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: StatusLightInactive
10+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords: []
12+
m_CustomRenderQueue: -1
13+
m_SavedProperties:
14+
serializedVersion: 2
15+
m_TexEnvs:
16+
data:
17+
first:
18+
name: _MainTex
19+
second:
20+
m_Texture: {fileID: 0}
21+
m_Scale: {x: 1, y: 1}
22+
m_Offset: {x: 0, y: 0}
23+
data:
24+
first:
25+
name: _Illum
26+
second:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
m_Floats:
31+
data:
32+
first:
33+
name: _Shininess
34+
second: .078125
35+
data:
36+
first:
37+
name: _EmissionLM
38+
second: 0
39+
m_Colors:
40+
data:
41+
first:
42+
name: _Color
43+
second: {r: .25, g: .229779407, b: .229779407, a: 1}
44+
data:
45+
first:
46+
name: _SpecColor
47+
second: {r: .992647052, g: .992647052, b: .992647052, a: 1}

‎Assets/Materials/StatusLightInactive.mat.meta‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/StatusLightStrike.mat‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 3
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: StatusLightStrike
10+
m_Shader: {fileID: 12, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords: []
12+
m_CustomRenderQueue: -1
13+
m_SavedProperties:
14+
serializedVersion: 2
15+
m_TexEnvs:
16+
data:
17+
first:
18+
name: _MainTex
19+
second:
20+
m_Texture: {fileID: 0}
21+
m_Scale: {x: 1, y: 1}
22+
m_Offset: {x: 0, y: 0}
23+
data:
24+
first:
25+
name: _Illum
26+
second:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
m_Floats:
31+
data:
32+
first:
33+
name: _Shininess
34+
second: .078125
35+
data:
36+
first:
37+
name: _EmissionLM
38+
second: 0
39+
m_Colors:
40+
data:
41+
first:
42+
name: _Color
43+
second: {r: 1, g: 0, b: 0, a: 1}
44+
data:
45+
first:
46+
name: _SpecColor
47+
second: {r: .992647052, g: .992647052, b: .992647052, a: 1}

‎Assets/Materials/StatusLightStrike.mat.meta‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/TimerText.mat‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 3
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: TimerText
10+
m_Shader: {fileID: 4800000, guid: 9a8caac139a79844b89ac46656e381e0, type: 3}
11+
m_ShaderKeywords: []
12+
m_CustomRenderQueue: -1
13+
m_SavedProperties:
14+
serializedVersion: 2
15+
m_TexEnvs:
16+
data:
17+
first:
18+
name: _MainTex
19+
second:
20+
m_Texture: {fileID: 2800000, guid: ddbf3bd6624ad76429ef21634f6865c7, type: 3}
21+
m_Scale: {x: 1, y: 1}
22+
m_Offset: {x: 0, y: 0}
23+
m_Floats: {}
24+
m_Colors:
25+
data:
26+
first:
27+
name: _Color
28+
second: {r: .74626863, g: 0, b: 0, a: 1}

‎Assets/Materials/TimerText.mat.meta‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)