Browse Source

Merge branch 'master' of https://github.com/snozbot/fungus into save-system

# Conflicts:
#	Assets/Tests/Save.meta
master
Christopher 8 years ago
parent
commit
0db373759d
  1. 1
      Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt
  2. 8
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs
  3. 3494
      Assets/Tests/Narrative/MenuTests.unity
  4. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab
  5. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab
  6. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab
  7. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab

1
Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt vendored

@ -220,6 +220,7 @@ M.menuoptions = {}
-- Set the active menudialog to use with the menu function
function M.setmenudialog(menudialog)
M.menuoptions.menudialog = menudialog
luautils.SetMenuDialog(menudialog)
end
-- Gets the active menu dialog, or creates one if none exists yet

8
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs vendored

@ -461,6 +461,14 @@ namespace Fungus
SayDialog.ActiveSayDialog = sayDialog;
}
/// <summary>
/// Sync the active menu dialog with what Lua thinks the MenuDialog should be
/// </summary>
public void SetMenuDialog(MenuDialog menuDialog)
{
MenuDialog.ActiveMenuDialog = menuDialog;
}
#endregion
#region LuaEnvironmentInitializer implementation

3494
Assets/Tests/Narrative/MenuTests.unity

File diff suppressed because it is too large Load Diff

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeCollisionFailure
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeCollisionSuccess
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeTriggerFailure
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeTriggerSuccess
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

Loading…
Cancel
Save