Skip to content

Commit 57a6fd2

Browse files
HunterBarclayHunterBarclay
authored
Beta bugs (#911)
2 parents 5b3b596 + 0b4b30b commit 57a6fd2

File tree

30 files changed

+292
-183
lines changed

30 files changed

+292
-183
lines changed

‎engine/Assets/Prefabs/MainMenu/MenuPanel.prefab

Lines changed: 30 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RectTransform:
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
m_AnchorMin: {x: 0, y: 0}
3737
m_AnchorMax: {x: 0, y: 0}
38-
m_AnchoredPosition: {x: 203.942, y: 124.5}
38+
m_AnchoredPosition: {x: 203.94238, y: 124.5}
3939
m_SizeDelta: {x: 164.613, y: 80}
4040
m_Pivot: {x: 0.5, y: 0.5}
4141
--- !u!1 &1515119109010333078
@@ -518,7 +518,7 @@ RectTransform:
518518
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
519519
m_AnchorMin: {x: 1, y: 1}
520520
m_AnchorMax: {x: 1, y: 1}
521-
m_AnchoredPosition: {x: -96, y: -45}
521+
m_AnchoredPosition: {x: -96, y: -35}
522522
m_SizeDelta: {x: 200, y: 50}
523523
m_Pivot: {x: 0.5, y: 0.5}
524524
--- !u!222 &4982241176548875976
@@ -584,7 +584,7 @@ MonoBehaviour:
584584
m_fontSizeMax: 72
585585
m_fontStyle: 0
586586
m_HorizontalAlignment: 2
587-
m_VerticalAlignment: 256
587+
m_VerticalAlignment: 512
588588
m_textAlignment: 65535
589589
m_characterSpacing: 0
590590
m_wordSpacing: 0
@@ -2927,6 +2927,7 @@ GameObject:
29272927
- component: {fileID: 7650142357145042731}
29282928
- component: {fileID: 8299766618362973656}
29292929
- component: {fileID: 5918555264457123375}
2930+
- component: {fileID: 3742070991845310211}
29302931
m_Layer: 5
29312932
m_Name: SocialsButton
29322933
m_TagString: Untagged
@@ -2951,7 +2952,7 @@ RectTransform:
29512952
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
29522953
m_AnchorMin: {x: 0.5, y: 0.5}
29532954
m_AnchorMax: {x: 0.5, y: 0.5}
2954-
m_AnchoredPosition: {x: 0, y: 45}
2955+
m_AnchoredPosition: {x: 0, y: 55}
29552956
m_SizeDelta: {x: 200, y: 50}
29562957
m_Pivot: {x: 0.5, y: 0.5}
29572958
--- !u!114 &7650142357145042731
@@ -3073,7 +3074,7 @@ MonoBehaviour:
30733074
m_fontSizeMax: 72
30743075
m_fontStyle: 0
30753076
m_HorizontalAlignment: 2
3076-
m_VerticalAlignment: 256
3077+
m_VerticalAlignment: 512
30773078
m_textAlignment: 65535
30783079
m_characterSpacing: 0
30793080
m_wordSpacing: 0
@@ -3107,6 +3108,20 @@ MonoBehaviour:
31073108
m_hasFontAssetChanged: 0
31083109
m_baseMaterial: {fileID: 0}
31093110
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
3111+
--- !u!114 &3742070991845310211
3112+
MonoBehaviour:
3113+
m_ObjectHideFlags: 0
3114+
m_CorrespondingSourceObject: {fileID: 0}
3115+
m_PrefabInstance: {fileID: 0}
3116+
m_PrefabAsset: {fileID: 0}
3117+
m_GameObject: {fileID: 6467115307618636652}
3118+
m_Enabled: 1
3119+
m_EditorHideFlags: 0
3120+
m_Script: {fileID: 11500000, guid: b4beff8dfc316ef46af2e567d41144e1, type: 3}
3121+
m_Name:
3122+
m_EditorClassIdentifier:
3123+
sizeStart: 0
3124+
sizeEnd: 30
31103125
--- !u!1 &6705991427988994757
31113126
GameObject:
31123127
m_ObjectHideFlags: 0
@@ -3292,7 +3307,7 @@ RectTransform:
32923307
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
32933308
m_AnchorMin: {x: 1, y: 1}
32943309
m_AnchorMax: {x: 1, y: 1}
3295-
m_AnchoredPosition: {x: -280, y: -45}
3310+
m_AnchoredPosition: {x: -280, y: -35}
32963311
m_SizeDelta: {x: 250, y: 50}
32973312
m_Pivot: {x: 0.5, y: 0.5}
32983313
--- !u!222 &1316101759688776880
@@ -3360,7 +3375,7 @@ MonoBehaviour:
33603375
m_fontSizeMax: 72
33613376
m_fontStyle: 0
33623377
m_HorizontalAlignment: 2
3363-
m_VerticalAlignment: 256
3378+
m_VerticalAlignment: 512
33643379
m_textAlignment: 65535
33653380
m_characterSpacing: 0
33663381
m_wordSpacing: 0
@@ -3876,15 +3891,14 @@ GameObject:
38763891
- component: {fileID: 4758894416657705936}
38773892
- component: {fileID: 7455120067468898109}
38783893
- component: {fileID: 5092367183751081367}
3879-
- component: {fileID: 6136904902320570529}
38803894
- component: {fileID: 7556145504087482516}
38813895
m_Layer: 5
38823896
m_Name: MakeAnythingImage
38833897
m_TagString: Untagged
38843898
m_Icon: {fileID: 0}
38853899
m_NavMeshLayer: 0
38863900
m_StaticEditorFlags: 0
3887-
m_IsActive: 1
3901+
m_IsActive: 0
38883902
--- !u!224 &4758894416657705936
38893903
RectTransform:
38903904
m_ObjectHideFlags: 0
@@ -3902,8 +3916,8 @@ RectTransform:
39023916
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
39033917
m_AnchorMin: {x: 0, y: 0}
39043918
m_AnchorMax: {x: 1, y: 1}
3905-
m_AnchoredPosition: {x: -330, y: 0}
3906-
m_SizeDelta: {x: -540, y: 0}
3919+
m_AnchoredPosition: {x: -319.08887, y: 0}
3920+
m_SizeDelta: {x: -536.1231, y: -30}
39073921
m_Pivot: {x: 0.5, y: 0.5}
39083922
--- !u!222 &7455120067468898109
39093923
CanvasRenderer:
@@ -3943,62 +3957,19 @@ MonoBehaviour:
39433957
m_FillOrigin: 0
39443958
m_UseSpriteMesh: 0
39453959
m_PixelsPerUnitMultiplier: 1
3946-
--- !u!114 &6136904902320570529
3947-
MonoBehaviour:
3948-
m_ObjectHideFlags: 0
3949-
m_CorrespondingSourceObject: {fileID: 0}
3950-
m_PrefabInstance: {fileID: 0}
3951-
m_PrefabAsset: {fileID: 0}
3952-
m_GameObject: {fileID: 7692753560248411300}
3953-
m_Enabled: 1
3954-
m_EditorHideFlags: 0
3955-
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
3956-
m_Name:
3957-
m_EditorClassIdentifier:
3958-
m_Navigation:
3959-
m_Mode: 3
3960-
m_WrapAround: 0
3961-
m_SelectOnUp: {fileID: 0}
3962-
m_SelectOnDown: {fileID: 0}
3963-
m_SelectOnLeft: {fileID: 0}
3964-
m_SelectOnRight: {fileID: 0}
3965-
m_Transition: 1
3966-
m_Colors:
3967-
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
3968-
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
3969-
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
3970-
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
3971-
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
3972-
m_ColorMultiplier: 1
3973-
m_FadeDuration: 0.1
3974-
m_SpriteState:
3975-
m_HighlightedSprite: {fileID: 0}
3976-
m_PressedSprite: {fileID: 0}
3977-
m_SelectedSprite: {fileID: 0}
3978-
m_DisabledSprite: {fileID: 0}
3979-
m_AnimationTriggers:
3980-
m_NormalTrigger: Normal
3981-
m_HighlightedTrigger: Highlighted
3982-
m_PressedTrigger: Pressed
3983-
m_SelectedTrigger: Selected
3984-
m_DisabledTrigger: Disabled
3985-
m_Interactable: 1
3986-
m_TargetGraphic: {fileID: 5092367183751081367}
3987-
m_OnClick:
3988-
m_PersistentCalls:
3989-
m_Calls: []
39903960
--- !u!114 &7556145504087482516
39913961
MonoBehaviour:
39923962
m_ObjectHideFlags: 0
39933963
m_CorrespondingSourceObject: {fileID: 0}
39943964
m_PrefabInstance: {fileID: 0}
39953965
m_PrefabAsset: {fileID: 0}
39963966
m_GameObject: {fileID: 7692753560248411300}
3997-
m_Enabled: 1
3967+
m_Enabled: 0
39983968
m_EditorHideFlags: 0
39993969
m_Script: {fileID: 11500000, guid: 862bef5238d6776428229d7d3793632e, type: 3}
40003970
m_Name:
40013971
m_EditorClassIdentifier:
3972+
_maxRatio: 1.5
40023973
--- !u!1 &7861776554651449354
40033974
GameObject:
40043975
m_ObjectHideFlags: 0
@@ -5498,7 +5469,7 @@ RectTransform:
54985469
- {fileID: 3042156332687130133}
54995470
- {fileID: 4675518427868541470}
55005471
m_Father: {fileID: 0}
5501-
m_RootOrder: -1
5472+
m_RootOrder: 0
55025473
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
55035474
m_AnchorMin: {x: 0, y: 0}
55045475
m_AnchorMax: {x: 1, y: 1}
@@ -7194,7 +7165,7 @@ RectTransform:
71947165
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
71957166
m_AnchorMin: {x: 1, y: 1}
71967167
m_AnchorMax: {x: 1, y: 1}
7197-
m_AnchoredPosition: {x: -660, y: -45}
7168+
m_AnchoredPosition: {x: -660, y: -35}
71987169
m_SizeDelta: {x: 250, y: 50}
71997170
m_Pivot: {x: 0.5, y: 0.5}
72007171
--- !u!222 &1008696145373591341
@@ -7260,7 +7231,7 @@ MonoBehaviour:
72607231
m_fontSizeMax: 72
72617232
m_fontStyle: 0
72627233
m_HorizontalAlignment: 2
7263-
m_VerticalAlignment: 256
7234+
m_VerticalAlignment: 512
72647235
m_textAlignment: 65535
72657236
m_characterSpacing: 0
72667237
m_wordSpacing: 0

‎engine/Assets/Scenes/GridMenuScene.unity

Lines changed: 61 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,10 +2090,10 @@ RectTransform:
20902090
m_Father: {fileID: 1049252815}
20912091
m_RootOrder: -1
20922092
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2093-
m_AnchorMin: {x: 0.5, y: 0.5}
2094-
m_AnchorMax: {x: 0.5, y: 0.5}
2093+
m_AnchorMin: {x: 0, y: 0}
2094+
m_AnchorMax: {x: 1, y: 1}
20952095
m_AnchoredPosition: {x: 0, y: 0}
2096-
m_SizeDelta: {x: 100, y: 100}
2096+
m_SizeDelta: {x: 0, y: 0}
20972097
m_Pivot: {x: 0.5, y: 0.5}
20982098
--- !u!1 &738148807
20992099
GameObject:
@@ -6170,6 +6170,10 @@ PrefabInstance:
61706170
serializedVersion: 3
61716171
m_TransformParent: {fileID: 817081843}
61726172
m_Modifications:
6173+
- target: {fileID: 386305692573586000, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6174+
propertyPath: m_AnchoredPosition.x
6175+
value: 203.94238
6176+
objectReference: {fileID: 0}
61736177
- target: {fileID: 583234295272538043, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
61746178
propertyPath: m_AnchoredPosition.y
61756179
value: -35
@@ -6186,6 +6190,46 @@ PrefabInstance:
61866190
propertyPath: m_VerticalAlignment
61876191
value: 512
61886192
objectReference: {fileID: 0}
6193+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6194+
propertyPath: m_AnchorMax.x
6195+
value: 1
6196+
objectReference: {fileID: 0}
6197+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6198+
propertyPath: m_AnchorMax.y
6199+
value: 1
6200+
objectReference: {fileID: 0}
6201+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6202+
propertyPath: m_AnchorMin.x
6203+
value: 0
6204+
objectReference: {fileID: 0}
6205+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6206+
propertyPath: m_AnchorMin.y
6207+
value: 0
6208+
objectReference: {fileID: 0}
6209+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6210+
propertyPath: m_SizeDelta.x
6211+
value: -536.1231
6212+
objectReference: {fileID: 0}
6213+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6214+
propertyPath: m_SizeDelta.y
6215+
value: -30
6216+
objectReference: {fileID: 0}
6217+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6218+
propertyPath: m_AnchoredPosition.x
6219+
value: -319.08887
6220+
objectReference: {fileID: 0}
6221+
- target: {fileID: 4758894416657705936, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6222+
propertyPath: m_AnchoredPosition.y
6223+
value: 0
6224+
objectReference: {fileID: 0}
6225+
- target: {fileID: 4927816837996252186, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6226+
propertyPath: m_IsActive
6227+
value: 1
6228+
objectReference: {fileID: 0}
6229+
- target: {fileID: 5092367183751081367, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6230+
propertyPath: m_PreserveAspect
6231+
value: 0
6232+
objectReference: {fileID: 0}
61896233
- target: {fileID: 5918555264457123375, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
61906234
propertyPath: m_VerticalAlignment
61916235
value: 512
@@ -6194,6 +6238,18 @@ PrefabInstance:
61946238
propertyPath: m_AnchoredPosition.y
61956239
value: -35
61966240
objectReference: {fileID: 0}
6241+
- target: {fileID: 7556145504087482516, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6242+
propertyPath: _maxRatio
6243+
value: 1.5
6244+
objectReference: {fileID: 0}
6245+
- target: {fileID: 7556145504087482516, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6246+
propertyPath: m_Enabled
6247+
value: 0
6248+
objectReference: {fileID: 0}
6249+
- target: {fileID: 7692753560248411300, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
6250+
propertyPath: m_IsActive
6251+
value: 1
6252+
objectReference: {fileID: 0}
61976253
- target: {fileID: 8178300921806933670, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
61986254
propertyPath: m_Name
61996255
value: MenuPanel
@@ -6290,7 +6346,8 @@ PrefabInstance:
62906346
propertyPath: m_AnchoredPosition.y
62916347
value: -35
62926348
objectReference: {fileID: 0}
6293-
m_RemovedComponents: []
6349+
m_RemovedComponents:
6350+
- {fileID: 6136904902320570529, guid: a164eb99c8d3069438923ac0c0b61657, type: 3}
62946351
m_RemovedGameObjects: []
62956352
m_AddedGameObjects: []
62966353
m_AddedComponents:

‎engine/Assets/Scripts/Gizmos/GizmoManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class GizmoManager {
1616
public static GizmoConfig? CurrentGizmoConfig => _currentGizmoConfig;
1717
private static Transform? _currentTargetTransform;
1818

19-
static GizmoManager() {
19+
public static void Setup() {
2020
SimulationRunner.OnUpdate += UpdateGizmo;
2121

2222
InputManager.AssignDigitalInput(

‎engine/Assets/Scripts/GodMode.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ private Analog TryGetSavedInput(string key, Analog defaultInput) {
4646
private float _lastUpdate = float.NaN;
4747
private Vector3 _speed, _lastPosition;
4848

49+
private GameObject _pointer;
50+
4951
private void Update() {
5052
bool godModeKeyDown = InputManager.MappedValueInputs[ENABLED_GOD_MODE_INPUT].Value == 1.0F;
5153
bool mouseDown = InputManager.MappedValueInputs[GOD_MODE_DRAG_INPUT].Value == 1.0F;
@@ -58,8 +60,8 @@ private void Update() {
5860
if (hit) {
5961
grabbedObject = GetGameObjectWithRigidbody(hitInfo.collider.gameObject);
6062
if (grabbedObject != null) {
61-
GameObject gameObj = new GameObject("GODMODE_POINTER_RB");
62-
_pointerBody = gameObj.AddComponent<Rigidbody>();
63+
_pointer = new GameObject("GODMODE_POINTER_RB");
64+
_pointerBody = _pointer.AddComponent<Rigidbody>();
6365
_pointerBody.isKinematic = true;
6466

6567
_lastUpdate = Time.realtimeSinceStartup;
@@ -98,6 +100,9 @@ private void Update() {
98100
if (!mouseDown && grabJoint != null) {
99101
Destroy(grabJoint);
100102
Destroy(_pointerBody);
103+
if (_pointer != null)
104+
Destroy(_pointer);
105+
101106
_pointerBody = null;
102107
grabbedObject.GetComponent<Rigidbody>().velocity = _speed;
103108
grabbedObject = null;

‎engine/Assets/Scripts/Modes/Aether/ServerTestMode.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public void Start() {
5151
_ghost.Freeze();
5252

5353
SimulationRunner.OnGameObjectDestroyed += End;
54+
MainHUD.RemoveAllItemsFromDrawer();
5455
}
5556

5657
public void KillClient(int i) {
@@ -63,7 +64,14 @@ public void KillClients() {
6364
}
6465
}
6566

67+
private bool _isFrozen = false;
68+
6669
public void Update() {
70+
if (_ghost is not null && !_isFrozen) {
71+
_ghost.Freeze();
72+
_isFrozen = true;
73+
}
74+
6775
var transformsList = new List<ServerTransforms>();
6876
if (_ghost is null || _host is null)
6977
return;

0 commit comments

Comments
 (0)