Merge branch 'release/1.11.2'

skahal · Jun 10, 2016 · e840a1e · e840a1e
2 parents d578e3f + 45d6d6c
commit e840a1e
Show file tree

Hide file tree

Showing 83 changed files with 1,934 additions and 592 deletions.
diff --git a/README.md b/README.md
@@ -93,15 +93,13 @@ If you want to run Buildron and auto start/connect to CI server, just pass the a
 - On Windows: Buildron.exe autostart
 - On Mac (OSX): open Buildron.app --args autostart
 
-## Roadmap
- - Use Unity Cloud Build to build releases.
+## Roadmap
  - Push Buildron RC to GitHub.
  - Implement new builds providers:
    - Travis CI
    - AppHarbor
    - Unity Cloud Build 
  - Change the way that Buildron and Buildron RC communicate, maybe expose a rest web api.  
- - Add to wiki how mods/sounds works.
  - Supports themes.
 
 --------

diff --git a/src/Buildron/Assets/_Assets/Prefab/Resources/BuildPrefab.prefab b/src/Buildron/Assets/_Assets/Prefab/Resources/BuildPrefab.prefab
@@ -608,8 +608,7 @@ MonoBehaviour:
   FailedColor: {r: 0.85820895, g: 0.12168635, b: 0.12168635, a: 1}
   RunningColor: {r: 0.8731343, g: 0.8731343, b: 0.16289821, a: 1}
   QueuedColor: {r: 0.36078432, g: 0.45490196, b: 0.5529412, a: 1}
-  UserAvatarIconMaterial: {fileID: 2100000, guid: eca123d5a0a2c4d6db357111b9b7741e,
-    type: 2}
+  UserAvatarIconMaterial: {fileID: 0}
   StatusChangedForce: {x: 0, y: 1000, z: 0}
   BuildHighlightZChange: -2
   VisibleMaxYVelocity: 0.3
@@ -906,7 +905,7 @@ SphereCollider:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100022}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.5
@@ -918,7 +917,7 @@ SphereCollider:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100024}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.5
@@ -930,7 +929,7 @@ SphereCollider:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100026}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.5
@@ -942,7 +941,7 @@ SphereCollider:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100018}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.5

diff --git a/src/Buildron/Assets/_Assets/Scenes/MainScene.unity b/src/Buildron/Assets/_Assets/Scenes/MainScene.unity
@@ -1263,6 +1263,7 @@ MonoBehaviour:
   ScheduledTriggerAvatar: {fileID: 2800000, guid: 6ba02afabc2a24312b81d12ffb7e9104,
     type: 3}
   RetryTriggerAvatar: {fileID: 2800000, guid: 80ba897a99a254866823d382f7816035, type: 3}
+  UnunknownAvatar: {fileID: 2800000, guid: 6f2f14440482e4449b3a2877897f7909, type: 3}
 --- !u!1 &365713297
 GameObject:
   m_ObjectHideFlags: 0
@@ -7477,7 +7478,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   StatusLabels:
-  - {fileID: 1952588444}
+  - {fileID: 1828986998}
   RemoteControlInfoImage: {fileID: 539509755}
   RemoteControlInfoLabel: {fileID: 254256018}
   FilteredInfo: {fileID: 1268527783}