Skip to content

Commit

Permalink
Lots of stuff. Read the description.
Browse files Browse the repository at this point in the history
+ New tire suspension
+ New internal tag structure
+ Multi-robot singleplayer
+ Fixed building duplication bug
  • Loading branch information
griffinteller committed May 24, 2020
1 parent a254a8c commit ed86937
Show file tree
Hide file tree
Showing 235 changed files with 4,760 additions and 3,934 deletions.
2 changes: 1 addition & 1 deletion Assets/Materials/Industrial/Standard/BasicCube.mat
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1}
- _Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
2 changes: 1 addition & 1 deletion Assets/Materials/Industrial/Standard/tire.mat
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1}
- _Color: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
2 changes: 1 addition & 1 deletion Assets/Materials/New Material 1.mat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: d8d47be058e02584eb064caabde289b0, type: 3}
m_Texture: {fileID: 2800000, guid: 70af04f9b611c8e439fbea5881b54b6b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand Down
79 changes: 79 additions & 0 deletions Assets/Materials/New Material 2.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material 2
m_Shader: {fileID: 4800000, guid: cd2492e1f350477e916e76b5ca5e15b8, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _ObjectWidth: 0.5
- _OcclusionStrength: 1
- _OutlineWidth: 0.02
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0.9587312, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

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

Binary file removed Assets/Materials/angryimg (1).png
Binary file not shown.
Binary file removed Assets/Materials/angryimg (2).png
Binary file not shown.
Binary file added Assets/Materials/angryimg (4).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

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

Binary file added Assets/Materials/angryimg (5).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

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

Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc3284eace5a64d4bb516df7d7effdb9, type: 3}
m_Name: PunSceneSettingsFile
m_EditorClassIdentifier:
SceneSettingsListFoldoutOpen: 1
MinViewIdPerScene:
- sceneAsset: {fileID: 102900000, guid: 559222f4671e440cba71aecba1de3505, type: 3}
sceneName: SceneView_A
minViewId: 2
- sceneAsset: {fileID: 102900000, guid: a81615022a16c489aac8daadf8f51fae, type: 3}
sceneName: SceneView_B
minViewId: 10
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc3284eace5a64d4bb516df7d7effdb9, type: 3}
m_Name: PunSceneSettingsFile
m_EditorClassIdentifier:
SceneSettingsListFoldoutOpen: 1
MinViewIdPerScene: []
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ MonoBehaviour:
AppIdVoice:
AppVersion:
UseNameServer: 1
FixedRegion: usw
FixedRegion:
Server:
Port: 0
Protocol: 0
AuthMode: 0
EnableLobbyStatistics: 0
NetworkLogging: 1
DevRegion: usw
PunLogging: 2
PunLogging: 0
EnableSupportLogger: 0
RunInBackground: 1
StartInOfflineMode: 0
RpcList:
- BuildRobotRpc
- ClickRpc
- DestroyRpc
- BuildRobotRpc
DisableAutoOpenWizard: 1
ShowSettings: 1
ShowSettings: 0
DevRegionSetOnce: 1
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ LineRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6226200332777473226}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 0
Expand Down Expand Up @@ -72,8 +72,8 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: -100}
- {x: 0, y: 0, z: 4000}
- {x: 0, y: 0, z: -4000}
- {x: 0, y: 0, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.1
Expand Down Expand Up @@ -122,7 +122,7 @@ LineRenderer:
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
numCapVertices: 10
alignment: 0
textureMode: 0
shadowBias: 0.5
Expand All @@ -141,5 +141,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5470bb5450b74d2b8ff5961c5c9c7b18, type: 3}
m_Name:
m_EditorClassIdentifier:
multiplier: 1
multiplier: 0.1
lineRenderer: {fileID: 6226200332777473225}
50 changes: 50 additions & 0 deletions Assets/Prefab/Internal/Other/ClassicTagDirector.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2612124392210836543
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2612124392210836541}
- component: {fileID: 2612124392210836542}
m_Layer: 0
m_Name: ClassicTagDirector
m_TagString: GameDirector
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2612124392210836541
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2612124392210836543}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2612124392210836542
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2612124392210836543}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b9a56882be3f4a419451ddd12cf704eb, type: 3}
m_Name:
m_EditorClassIdentifier:
fullyLoaded: 0
currentItActorNumber: -1
lastItActorNumber: -1
itTint: {r: 1, g: 0, b: 0, a: 1}
tagCooldownTime: 10

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

46 changes: 46 additions & 0 deletions Assets/Prefab/Internal/Other/FreeplayDirector.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2572036287532900858
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9078338514294247894}
- component: {fileID: 4140264822069007822}
m_Layer: 0
m_Name: FreeplayDirector
m_TagString: GameDirector
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9078338514294247894
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2572036287532900858}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -200, y: 9, z: -400}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4140264822069007822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2572036287532900858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea6fe279a7a5418e9803b13572ff62c5, type: 3}
m_Name:
m_EditorClassIdentifier:
fullyLoaded: 0

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

53 changes: 53 additions & 0 deletions Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &633087595024629084
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4815207827840863878}
- component: {fileID: 2541324036647193942}
m_Layer: 0
m_Name: SinglePlayerDirector
m_TagString: GameDirector
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4815207827840863878
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633087595024629084}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -268.3477, y: 11.070056, z: -409.1089}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2541324036647193942
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633087595024629084}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23534a08e29b4f6eb2148b137cf166ee, type: 3}
m_Name:
m_EditorClassIdentifier:
fullyLoaded: 0
numControllableBots: 0
map: 0
robotParentPrefab: {fileID: 4421177872403235923, guid: d5b926445abbe244f94ecf6a59e62e03,
type: 3}
startingPosition: {x: -268, y: 0, z: -410}
maxPlacementRadius: 20
startingHeight: 3
Loading

0 comments on commit ed86937

Please sign in to comment.