-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move some editor code under #if UNITY_EDITOR
- Loading branch information
Vatsal Ambastha
committed
Apr 15, 2020
1 parent
a602bee
commit 22b0be8
Showing
11 changed files
with
3,162 additions
and
2,463 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
4,334 changes: 2,309 additions & 2,025 deletions
4,334
Assets/Adrenak/Tork/Common/Prefabs/Tocus.prefab
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
|
||
=== Wed Apr 15 20:57:04 2020 | ||
|
||
Packages were changed. | ||
Update Mode: resetToDefaultDependencies | ||
|
||
The following packages were added: | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] | ||
[email protected] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
{ | ||
"dependencies": { | ||
"com.unity.ads": "2.0.8", | ||
"com.unity.analytics": "3.2.2", | ||
"com.unity.collab-proxy": "1.2.15", | ||
"com.unity.package-manager-ui": "2.0.8", | ||
"com.unity.purchasing": "2.0.3", | ||
"com.unity.textmeshpro": "1.4.1", | ||
"com.unity.modules.ai": "1.0.0", | ||
"com.unity.modules.animation": "1.0.0", | ||
"com.unity.modules.assetbundle": "1.0.0", | ||
"com.unity.modules.audio": "1.0.0", | ||
"com.unity.modules.cloth": "1.0.0", | ||
"com.unity.modules.director": "1.0.0", | ||
"com.unity.modules.imageconversion": "1.0.0", | ||
"com.unity.modules.imgui": "1.0.0", | ||
"com.unity.modules.jsonserialize": "1.0.0", | ||
"com.unity.modules.particlesystem": "1.0.0", | ||
"com.unity.modules.physics": "1.0.0", | ||
"com.unity.modules.physics2d": "1.0.0", | ||
"com.unity.modules.screencapture": "1.0.0", | ||
"com.unity.modules.terrain": "1.0.0", | ||
"com.unity.modules.terrainphysics": "1.0.0", | ||
"com.unity.modules.tilemap": "1.0.0", | ||
"com.unity.modules.ui": "1.0.0", | ||
"com.unity.modules.uielements": "1.0.0", | ||
"com.unity.modules.umbra": "1.0.0", | ||
"com.unity.modules.unityanalytics": "1.0.0", | ||
"com.unity.modules.unitywebrequest": "1.0.0", | ||
"com.unity.modules.unitywebrequestassetbundle": "1.0.0", | ||
"com.unity.modules.unitywebrequestaudio": "1.0.0", | ||
"com.unity.modules.unitywebrequesttexture": "1.0.0", | ||
"com.unity.modules.unitywebrequestwww": "1.0.0", | ||
"com.unity.modules.vehicles": "1.0.0", | ||
"com.unity.modules.video": "1.0.0", | ||
"com.unity.modules.vr": "1.0.0", | ||
"com.unity.modules.wind": "1.0.0", | ||
"com.unity.modules.xr": "1.0.0" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!1386491679 &1 | ||
PresetManager: | ||
m_ObjectHideFlags: 0 | ||
m_DefaultList: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
m_EditorVersion: 2017.1.0f3 | ||
m_EditorVersion: 2018.4.13f1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!937362698 &1 | ||
VFXManager: | ||
m_ObjectHideFlags: 0 | ||
m_IndirectShader: {fileID: 0} | ||
m_CopyBufferShader: {fileID: 0} | ||
m_SortShader: {fileID: 0} | ||
m_RenderPipeSettingsPath: | ||
m_FixedTimeStep: 0.016666668 | ||
m_MaxDeltaTime: 0.05 |