Skip to content

Commit f56c86b

Browse files
authored
Fix/plugin merge fixes (#848)
* Remove missing scripts on LuaManager * Fix non-VR UI layout * Label wording changes * Tweak labs panel plugin/scripts button * Add a button to open the plugin docs and improve labels and icons for other buttons * Prevent errors when the scripts panel is open by default
1 parent 2941991 commit f56c86b

File tree

8 files changed

+841
-315
lines changed

8 files changed

+841
-315
lines changed

Assets/Prefabs/API/LuaManager.prefab

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 4518648732169865284}
12-
- component: {fileID: 4518648732169865287}
1312
- component: {fileID: 4518648732169865286}
14-
- component: {fileID: 4518648732169865285}
1513
m_Layer: 0
1614
m_Name: LuaManager
1715
m_TagString: Untagged
@@ -26,26 +24,14 @@ Transform:
2624
m_PrefabInstance: {fileID: 0}
2725
m_PrefabAsset: {fileID: 0}
2826
m_GameObject: {fileID: 4518648732169865281}
27+
serializedVersion: 2
2928
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3029
m_LocalPosition: {x: 5.063512, y: 11.270567, z: 4.8805537}
3130
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!114 &4518648732169865287
37-
MonoBehaviour:
38-
m_ObjectHideFlags: 0
39-
m_CorrespondingSourceObject: {fileID: 0}
40-
m_PrefabInstance: {fileID: 0}
41-
m_PrefabAsset: {fileID: 0}
42-
m_GameObject: {fileID: 4518648732169865281}
43-
m_Enabled: 1
44-
m_EditorHideFlags: 0
45-
m_Script: {fileID: 11500000, guid: 0d8a34048279f1044b363c02a68c74f7, type: 3}
46-
m_Name:
47-
m_EditorClassIdentifier:
48-
port: 41912
4935
--- !u!114 &4518648732169865286
5036
MonoBehaviour:
5137
m_ObjectHideFlags: 0
@@ -58,33 +44,5 @@ MonoBehaviour:
5844
m_Script: {fileID: 11500000, guid: e414c418845bfe249a7f10c09b4d60ce, type: 3}
5945
m_Name:
6046
m_EditorClassIdentifier:
61-
--- !u!114 &4518648732169865285
62-
MonoBehaviour:
63-
m_ObjectHideFlags: 0
64-
m_CorrespondingSourceObject: {fileID: 0}
65-
m_PrefabInstance: {fileID: 0}
66-
m_PrefabAsset: {fileID: 0}
67-
m_GameObject: {fileID: 4518648732169865281}
68-
m_Enabled: 1
69-
m_EditorHideFlags: 0
70-
m_Script: {fileID: 11500000, guid: 5fcb9de9b1350864eaa72a548526b7d9, type: 3}
71-
m_Name:
72-
m_EditorClassIdentifier:
73-
MaxHeight: 0.7
74-
SmallTerminalRatio: 0.33
75-
ToggleSpeed: 360
76-
ToggleHotkey: '`'
77-
ToggleFullHotkey: '#`'
78-
BufferSize: 512
79-
ConsoleFont: {fileID: 0}
80-
InputCaret: '>'
81-
ShowGUIButtons: 0
82-
RightAlignButtons: 0
83-
InputContrast: 0
84-
InputAlpha: 0.5
85-
BackgroundColor: {r: 0, g: 0, b: 0, a: 1}
86-
ForegroundColor: {r: 1, g: 1, b: 1, a: 1}
87-
ShellColor: {r: 1, g: 1, b: 1, a: 1}
88-
InputColor: {r: 0, g: 1, b: 1, a: 1}
89-
WarningColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
90-
ErrorColor: {r: 1, g: 0, b: 0, a: 1}
47+
BackgroundScriptsToRun: []
48+
ScriptedWaveformSampleRate: 16000

0 commit comments

Comments
 (0)