Skip to content

Commit

Permalink
Merge pull request #240 from Dimencia/Beta
Browse files Browse the repository at this point in the history
Fix no planet error
  • Loading branch information
Archaegeo authored Mar 6, 2021
2 parents 45bedd7 + 6eeb19e commit 18f07a0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ButtonHUD.conf

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## ChangeLog - Most recent changes at the top

Version 5.341
- Fix no planet LUA error

Version 5.340 - PvP Distance flagging
- Hud now monitors for PvP space or not. If in PvP Space, hud will change to PvP color (red default), if in safe space or atmo, Safe color (the pale blue default)
- Added pvpHud colors. If you dont want the change, set them the same value as Safe.
Expand Down
6 changes: 2 additions & 4 deletions src/ButtonHUD.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5397,7 +5397,7 @@ function safeZone(WorldPos) -- Thanks to @SeM for the base code, modified to wor

-- Start of actual HUD Script. Written by Dimencia and Archaegeo. Optimization and Automation of scripting by ChronosWS Linked sources where appropriate, most have been modified.
function script.onStart()
VERSION_NUMBER = 5.340
VERSION_NUMBER = 5.341
SetupComplete = false
beginSetup = coroutine.create(function()
Nav.axisCommandManager:setupCustomTargetSpeedRanges(axisCommandId.longitudinal,
Expand Down Expand Up @@ -5809,8 +5809,6 @@ function script.onTick(timerId)

stalling = inAtmo and currentYaw < -YawStallAngle or currentYaw > YawStallAngle or currentPitch < -PitchStallAngle or currentPitch > PitchStallAngle

pvpZone, pvpDist, pvpName, _ = safeZone(worldPos)

deltaX = system.getMouseDeltaX()
deltaY = system.getMouseDeltaY()
if InvertMouse and not holdingCtrl then deltaY = -deltaY end
Expand All @@ -5829,7 +5827,7 @@ function script.onTick(timerId)
targetRoll = 0
maxKinematicUp = core.getMaxKinematicsParametersAlongAxis("ground", core.getConstructOrientationUp())[1]


pvpZone, pvpDist, pvpName, _ = safeZone(worldPos)

if isRemote() == 1 and screen_1 and screen_1.getMouseY() ~= -1 then
simulatedX = screen_1.getMouseX() * ResolutionX
Expand Down

0 comments on commit 18f07a0

Please sign in to comment.