NeonTea/quakeball
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix misc

Browse Source
This commit is contained in:
Jens Pitkänen 2020-08-10 03:50:25 +03:00
parent 77c2de6083
commit fb4dd3e801
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/GameObjects/Prefabs/Player.prefab
View File

@ -535,13 +535,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7391558913556166741} m_GameObject: {fileID: 7391558913556166741}
m_LocalRotation: {x: -0.16313043, y: -0, z: -0, w: 0.9866046} m_LocalRotation: {x: 0.16312791, y: 0, z: 0, w: 0.9866049}
m_LocalPosition: {x: 0, y: 1.86, z: -0.16} m_LocalPosition: {x: 0, y: 1.86, z: 0.16}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 7391558912774766616} m_Father: {fileID: 7391558912774766616}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -18.777, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 18.777, y: 0, z: 0}
--- !u!65 &7391558913556166743 --- !u!65 &7391558913556166743
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Scripts/Interface/StatScreen.cs
View File

@ -90,7 +90,7 @@ namespace NeonTea.Quakeball.Interface {
public void AddRow() { public void AddRow() {
GameObject rowobj = GameObject.Instantiate(RowPrefab); GameObject rowobj = GameObject.Instantiate(RowPrefab);
rowobj.transform.parent = BackroundPanel; rowobj.transform.SetParent(BackroundPanel, false);
RectTransform row = rowobj.GetComponent<RectTransform>(); RectTransform row = rowobj.GetComponent<RectTransform>();
Rows.Add(row); Rows.Add(row);

1
Assets/Scripts/Networking/Instances/Server.cs
View File

@ -99,7 +99,6 @@ namespace NeonTea.Quakeball.Networking.Instances {
public override void Handle(Connection conn, Packet packet) { public override void Handle(Connection conn, Packet packet) {
if (packet is ReadyPckt) { if (packet is ReadyPckt) {
Debug.Log("Got ready!");
if (Players[conn.uid].Controlled == null) { if (Players[conn.uid].Controlled == null) {
NetPlayer player = Players[conn.uid]; NetPlayer player = Players[conn.uid];
Player obj = Net.SpawnPlayer(GameMaster.GetSpawn(player)).GetComponent<Player>(); Player obj = Net.SpawnPlayer(GameMaster.GetSpawn(player)).GetComponent<Player>();

2
ProjectSettings/DynamicsManager.asset
View File

@ -19,7 +19,7 @@ PhysicsManager:
m_ClothInterCollisionStiffness: 0 m_ClothInterCollisionStiffness: 0
m_ContactsGeneration: 1 m_ContactsGeneration: 1
m_LayerCollisionMatrix: ffecffffffecffffffecffffffffffffffecffffffecffffffffffffffffffffc8d1ffffc8eaffffffecffffffeeffffc8e1fffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_LayerCollisionMatrix: ffecffffffecffffffecffffffffffffffecffffffecffffffffffffffffffffc8d1ffffc8eaffffffecffffffeeffffc8e1fffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1 m_AutoSimulation: 0
m_AutoSyncTransforms: 0 m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1 m_ReuseCollisionCallbacks: 1
m_ClothInterCollisionSettingsToggle: 0 m_ClothInterCollisionSettingsToggle: 0

4
ProjectSettings/TimeManager.asset
View File

@ -3,7 +3,7 @@
--- !u!5 &1 --- !u!5 &1
TimeManager: TimeManager:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Fixed Timestep: 0.02 Fixed Timestep: 0.0333333
Maximum Allowed Timestep: 0.33333334 Maximum Allowed Timestep: 0.33333334
m_TimeScale: 1 m_TimeScale: 1
Maximum Particle Timestep: 0.03 Maximum Particle Timestep: 0.0333333