Skip to content
This repository was archived by the owner on Dec 5, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ build/
logs/
workers/unity/external-default-unityclient.log
/.improbable
workers/unity/Assets/Plugins/Improbable/Editor/Generated/
workers/unity/Assets/Plugins/Improbable/Editor/Generated.meta
workers/unity/Assets/Plugins/Improbable/Generated/
workers/unity/Assets/Plugins/Improbable/Generated.meta
workers/unity/Assets/Plugins/Improbable/EntityPrefabs/
workers/unity/Assets/Plugins/Improbable/EntityPrefabs.meta
workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Generated.Code.*
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
**Note: This project runs on SpatialOS version 12.2.1 and not the latest version which is 13.0.0.**

# Wizards! (SpatialOS)

![Wizards Logo](wizards-logo.jpg)
Expand Down
Binary file modified snapshots/default.snapshot
Binary file not shown.
4 changes: 2 additions & 2 deletions spatialos.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "your_project_name_here",
"project_version": "1.0.0",
"sdk_version": "12.2.1",
"sdk_version": "13.0.0",
"dependencies": [
{"name": "standard_library", "version": "12.2.1"}
{"name": "standard_library", "version": "13.0.0"}
]
}
4 changes: 0 additions & 4 deletions workers/unity/.gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#Improbable Unity Ignores
build.json
.invoke.log
zip_toolbelt.log
Improbable.meta
Assets/Improbable
Assets/Plugins/Improbable
Assets/Plugins/x86/Improbable
Assets/Plugins/x86.meta
Assets/Plugins/x86_64/Improbable
Expand All @@ -14,7 +11,6 @@ Assets/Gamelogic/Generated.meta
Assembly-CSharp-Editor.csproj
Assembly-CSharp-firstpass.csproj
Assembly-CSharp.csproj
spatialos.*.build.json
*.log

# Standard Unity Ignores
Expand Down
1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/Barracks.prefab.meta

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

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/HQ.prefab.meta

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

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/NPCWizard.prefab.meta

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

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/Player.prefab.meta

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

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/SunLight.prefab.meta

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/Terrain.prefab.meta

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/Tree.prefab.meta

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

1 change: 1 addition & 0 deletions workers/unity/Assets/EntityPrefabs/UI.prefab.meta

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

10 changes: 10 additions & 0 deletions workers/unity/Assets/Plugins/Improbable.meta

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

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

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

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
@@ -0,0 +1,10 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

namespace Improbable.Unity.MinimalBuildSystem.Configuration
{
public enum BuildEnvironment
{
Local,
Cloud
}
}

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
@@ -0,0 +1,17 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

using System;
using UnityEditor;

namespace Improbable.Unity.MinimalBuildSystem.Configuration
{
[Serializable]
public class BuildEnvironmentConfig
{
public SpatialBuildPlatforms BuildPlatforms = SpatialBuildPlatforms.Current;
public BuildOptions BuildOptions = 0;

[NonSerialized] public bool ShowBuildOptions = true;
[NonSerialized] public bool ShowBuildPlatforms = true;
}
}

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
@@ -0,0 +1,20 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

using System.IO;
using Improbable.Unity.Util;

namespace Improbable.Unity.MinimalBuildSystem.Configuration
{
public static class BuildPaths
{
public static readonly string PrefabResourcesDirectory =
PathUtil.Combine("Assets", "Improbable", "Generated", "Resources", "EntityPrefabs").ToUnityPath();

public static readonly string PrefabSourceDirectory = PathUtil.Combine("Assets", "EntityPrefabs").ToUnityPath();

public static string BuildScratchDirectory
{
get { return Path.GetFullPath(Path.Combine("build", "worker")); }
}
}
}

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
@@ -0,0 +1,28 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#if !UNITY_2017_3_OR_NEWER
using System;
using UnityEditor;

namespace Improbable.Unity.MinimalBuildSystem.Configuration
{
/// <summary>
/// Fallback for Unity 2017.3f1 feature: EditorGUI.IndentLevelScope
/// </summary>
public class FallbackIndentLevelScope : IDisposable
{
private readonly int indent;

public FallbackIndentLevelScope(int increment)
{
indent = EditorGUI.indentLevel;
EditorGUI.indentLevel += indent;
}

public void Dispose()
{
EditorGUI.indentLevel = indent;
}
}
}
#endif

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
@@ -0,0 +1,23 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

using System;
using UnityEngine;

namespace Improbable.Unity.MinimalBuildSystem.Configuration
{
class GUIColorScope : IDisposable
{
private readonly Color color;

public GUIColorScope(Color newColor)
{
color = GUI.color;
GUI.color = newColor;
}

public void Dispose()
{
GUI.color = color;
}
}
}

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
@@ -0,0 +1,13 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

namespace Improbable.Unity.MinimalBuildSystem.Configuration
{
/// <summary>
/// Indicate whether or not built-out players should be compressed.
/// </summary>
public enum PlayerCompression
{
Enabled,
Disabled
}
}

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

Loading