Skip to content

Commit

Permalink
Updated to 2019.3.0f5 / Rebuilt VFX + Fixes in Game Options
Browse files Browse the repository at this point in the history
  • Loading branch information
peeweek committed Jan 16, 2020
1 parent 8ee78e8 commit 53b734a
Show file tree
Hide file tree
Showing 27 changed files with 6,228 additions and 6,929 deletions.
2,147 changes: 1,048 additions & 1,099 deletions Assets/Samples/ARRadar/ARRadar.vfx

Large diffs are not rendered by default.

818 changes: 403 additions & 415 deletions Assets/Samples/BonFire/VFX/BonFire.vfx

Large diffs are not rendered by default.

263 changes: 130 additions & 133 deletions Assets/Samples/BonFire/VFX/Clouds.vfx

Large diffs are not rendered by default.

752 changes: 367 additions & 385 deletions Assets/Samples/BonFire/VFX/FlyingLeaves.vfx

Large diffs are not rendered by default.

468 changes: 231 additions & 237 deletions Assets/Samples/Butterflies/Butterflies.vfx

Large diffs are not rendered by default.

246 changes: 120 additions & 126 deletions Assets/Samples/EllenHologram/EllenHologram.vfx

Large diffs are not rendered by default.

1,009 changes: 494 additions & 515 deletions Assets/Samples/GenieMagicLamp/VFX/GenieFX.vfx

Large diffs are not rendered by default.

522 changes: 256 additions & 266 deletions Assets/Samples/GenieMagicLamp/VFX/SandFX.vfx

Large diffs are not rendered by default.

986 changes: 278 additions & 708 deletions Assets/Samples/GrassWind/Environment_GrassWind.vfx

Large diffs are not rendered by default.

277 changes: 137 additions & 140 deletions Assets/Samples/GrassWind/Grass.vfx

Large diffs are not rendered by default.

166 changes: 81 additions & 85 deletions Assets/Samples/MorphingFace/MorphingFace.vfx

Large diffs are not rendered by default.

271 changes: 133 additions & 138 deletions Assets/Samples/Portal/Portal.vfx

Large diffs are not rendered by default.

470 changes: 229 additions & 241 deletions Assets/Samples/RibbonPack/RibbonPack.vfx

Large diffs are not rendered by default.

340 changes: 167 additions & 173 deletions Assets/Samples/SpaceshipHoloTable/VFX/ARUI-Table-PinScreen.vfx

Large diffs are not rendered by default.

318 changes: 155 additions & 163 deletions Assets/Samples/UnityLogo/UnityLogo.vfx

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

286 changes: 139 additions & 147 deletions Assets/Samples/Volumetric/Volumetric.vfx

Large diffs are not rendered by default.

267 changes: 132 additions & 135 deletions Assets/Samples/VoxelizedTerrain/VoxelizedTerrain.vfx

Large diffs are not rendered by default.

43 changes: 28 additions & 15 deletions Assets/VisualEffectSamples.unity
Original file line number Diff line number Diff line change
Expand Up @@ -7312,13 +7312,26 @@ GameObject:
m_Component:
- component: {fileID: 6088818471330612562}
- component: {fileID: 6088818471330612525}
- component: {fileID: 6088818471330612564}
m_Layer: 5
m_Name: Toggle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &6088818471330612564
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6088818471330612563}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3d2af8e5a631fd24991bfe567b038767, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6168194990882596466
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7533,8 +7546,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1338.9}
m_AnchoredPosition: {x: 0, y: -0.000030517578}
m_SizeDelta: {x: 0, y: 488.9}
m_Pivot: {x: 0, y: 1}
--- !u!1 &6700769477884228485
GameObject:
Expand Down Expand Up @@ -7725,8 +7738,8 @@ RectTransform:
m_Father: {fileID: 6700769479621243544}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5700202}
m_AnchorMax: {x: 1, y: 0.9999999}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -8082,9 +8095,9 @@ RectTransform:
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 20}
m_SizeDelta: {x: 0, y: 20}
m_Pivot: {x: 0, y: 0}
--- !u!1 &6700769478208655959
GameObject:
Expand Down Expand Up @@ -8737,8 +8750,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6700769477951473165}
m_HandleRect: {fileID: 6700769477951473162}
m_Direction: 2
m_Value: 1
m_Size: 0.42997983
m_Value: 0
m_Size: 0.15077294
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand All @@ -8759,9 +8772,9 @@ RectTransform:
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: -17}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6700769478717006668
CanvasRenderer:
Expand Down Expand Up @@ -9608,7 +9621,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!222 &6700769479311210132
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -9706,7 +9719,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.9999999, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -10130,9 +10143,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: -17}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6700769479651261318
CanvasRenderer:
Expand Down Expand Up @@ -12877,7 +12890,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Target Framerate (frames per second)
m_Text: Target Framerate (fps)
--- !u!1001 &7953774777476301330
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"com.unity.cinemachine": "2.3.5-preview.3",
"com.unity.render-pipelines.high-definition": "7.1.7",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.6",
"com.unity.timeline": "1.2.9",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
7 changes: 7 additions & 0 deletions Packages/net.peeweek.game-options/Runtime/GameOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace GameOptionsUtility
{

public static class GameOptions
{
public class Preferences
Expand All @@ -15,6 +16,12 @@ public class Preferences
public static AudioOptions audio;

static GameOptions()
{
Initialize();
}

[RuntimeInitializeOnLoadMethod]
static void Initialize()
{
graphics = GraphicOptions.Load();
graphics.Apply();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ public static GraphicOptions Load()

public void Apply()
{
Screen.SetResolution(width, height, fullScreenMode, refreshRate);
QualitySettings.vSyncCount = vSync ? 1 : 0;
Application.targetFrameRate = targetFrameRate;
Screen.SetResolution(width, height, fullScreenMode, refreshRate);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2019.3.0f3
m_EditorVersionWithRevision: 2019.3.0f3 (6c9e2bfd6f81)
m_EditorVersion: 2019.3.0f5
m_EditorVersionWithRevision: 2019.3.0f5 (44796c9d3c2c)

0 comments on commit 53b734a

Please sign in to comment.