Merge branch '1.9.4' into 1.10.2
d9d57e2Merge branch '1.8.9' into 1.9.424c58cbMerge branch '1.8' into 1.8.91ffeb01Update jGuic122d30Merge branch '1.8-path-segments' into 1.827fd25aFix crash when server responds with garbage to language query (fixes #51)db6b0ffFix / by 0 when two spectator keyframes are closer than 50ms (fixes #60)d61d0acFix hand of invisible spectated player being visible (fixes #59)f7460f9Re-enable time path after path playback (fixes #55)bdbffd5Add Catmull-Rom spline interpolator to simplepathing5cbfd28Generate interpolator settings from InterpolatorType enum6095aefFix loading and storing of default interpolator with settings3f52336Revert "Fix AbstractMethodError caused by FG2.0 not supporting lambdas (fixes #58)"c6293bcUpdate to FG2.2c8126edMerge '1.8' into 1.8.964898ceFix NPE when saving recorded resource pack70e3e54Fix AbstractMethodError caused by FG2.0 not supporting lambdas (fixes #58)3f2b3d6Fix replacing source file in Replay Editor (fixes #57)d2def94Fix duration of replays corrupted because of JVM/OS crash2c64030Refactor simple pathing timeline logic into dedicated class with unit tests Fix logic for user-set interpolators4deb374Enable validation on focus change for all number input fields5302bcaFix id and text of Replay Editor button in docs057edccManually inject root cert for cross-signed LetsEncrypt cert in requestscd16211Register new Property to imply that the path segment following a keyframe has a user-set interpolator instead of the default Modified Keyframe GUI to allow for custom Path interpolator
This commit is contained in:
@@ -252,6 +252,15 @@ public class CameraEntity extends EntityPlayerSP {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvisible() {
|
||||
Entity view = mc.getRenderViewEntity();
|
||||
if (view != this) {
|
||||
return view.isInvisible();
|
||||
}
|
||||
return super.isInvisible();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getLocationSkin() {
|
||||
Entity view = mc.getRenderViewEntity();
|
||||
|
||||
@@ -16,6 +16,10 @@ import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.util.ReadablePoint;
|
||||
|
||||
public class GuiEditMarkerPopup extends AbstractGuiPopup<GuiEditMarkerPopup> implements Typeable {
|
||||
private static GuiNumberField newGuiNumberField() {
|
||||
return new GuiNumberField().setSize(150, 20).setValidateOnFocusChange(true);
|
||||
}
|
||||
|
||||
private final ReplayHandler replayHandler;
|
||||
private final Marker marker;
|
||||
|
||||
@@ -23,15 +27,15 @@ public class GuiEditMarkerPopup extends AbstractGuiPopup<GuiEditMarkerPopup> imp
|
||||
|
||||
public final GuiTextField nameField = new GuiTextField().setSize(150, 20);
|
||||
// TODO: Replace with a min/sec/msec field
|
||||
public final GuiNumberField timeField = new GuiNumberField().setSize(150, 20).setPrecision(0);
|
||||
public final GuiNumberField timeField = newGuiNumberField().setPrecision(0);
|
||||
|
||||
public final GuiNumberField xField = new GuiNumberField().setSize(150, 20).setPrecision(10);
|
||||
public final GuiNumberField yField = new GuiNumberField().setSize(150, 20).setPrecision(10);
|
||||
public final GuiNumberField zField = new GuiNumberField().setSize(150, 20).setPrecision(10);
|
||||
public final GuiNumberField xField = newGuiNumberField().setPrecision(10);
|
||||
public final GuiNumberField yField = newGuiNumberField().setPrecision(10);
|
||||
public final GuiNumberField zField = newGuiNumberField().setPrecision(10);
|
||||
|
||||
public final GuiNumberField yawField = new GuiNumberField().setSize(150, 20).setPrecision(5);
|
||||
public final GuiNumberField pitchField = new GuiNumberField().setSize(150, 20).setPrecision(5);
|
||||
public final GuiNumberField rollField = new GuiNumberField().setSize(150, 20).setPrecision(5);
|
||||
public final GuiNumberField yawField = newGuiNumberField().setPrecision(5);
|
||||
public final GuiNumberField pitchField = newGuiNumberField().setPrecision(5);
|
||||
public final GuiNumberField rollField = newGuiNumberField().setPrecision(5);
|
||||
|
||||
public final GuiPanel inputs = GuiPanel.builder()
|
||||
.layout(new GridLayout().setColumns(2).setSpacingX(7).setSpacingY(3))
|
||||
|
||||
Reference in New Issue
Block a user