Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Scenes/GrandCanyon.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1421388808}
m_IndirectSpecularColor: {r: 0.06699521, g: 0.22289085, b: 0.49677116, a: 1}
m_IndirectSpecularColor: {r: 0.06697763, g: 0.22287329, b: 0.4967534, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down
5 changes: 5 additions & 0 deletions Assets/Scripts/Gamestate/PlayerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ private void Update()
GunHolder.transform.forward = inputManager.transform.forward;
UpdateAimAngleCmd(movement.AimAngle.y);
}

#if UNITY_EDITOR
if (Keyboard.current.iKey.isPressed)
healthController.GoInvincible();
#endif
}

// Hijinks for syncing aim from server to players
Expand Down
8 changes: 8 additions & 0 deletions Assets/Scripts/HealthController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ private void Start()
Player = GetComponent<PlayerManager>();
}

#if UNITY_EDITOR
public void GoInvincible()
{
maxhHealth = 100000000;
currentHealth = maxhHealth;
}
#endif

public void DealDamage(DamageInfo info)
{
if (!isNetworked)
Expand Down
11 changes: 11 additions & 0 deletions Assets/Scripts/Interactables/ConveyorBeltDirector.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using UnityEngine;
#if UNITY_EDITOR
using UnityEngine.InputSystem;
#endif

public class ConveyorBeltDirector : MonoBehaviour
{
Expand Down Expand Up @@ -53,4 +56,12 @@ private void FlipArrows()
leftArrow.enabled = direction > 0;
rightArrow.enabled = direction < 0;
}

#if UNITY_EDITOR
private void Update()
{
if (Keyboard.current.oKey.isPressed)
Flip(true);
}
#endif
}