Merge branch '1.8' into 1.9.4
0db1b9eFix opening a replay multiple times by quickly double clicking (fixes #25)9ff767bFix spectated player having the arm model of the camera playerd82cef3Make sure video folder exists before rendering (fixes #24)cc65b26Replace custom update system with forge update checkerc8b71dcAdd tooltips to ingame buttonsb240f8aFix camera path always playing from the beginning regardless of ctrl key4805e5eFix crash when setting two keyframes to the same time via the edit keyframe gui18f8303Fix crash when moving the last keyframefcd4c07Add error popup when trying to play path with reversed time keyframes Update jGui9c605baUpdate jGui Fix handling of ESC key in popups (fixes #17)721fdc4Allow moving the keyframe timeline cursor by dragging (fixes #18)1851e97Allow deletion of selected keyframes by pressing the DELETE key (fixes #19)d547098Fix markers not being removedb2c7faaFix marker not being deselected when clicking anywhere else4e6b387Update jGui Fix popups being drawn outside of the actually visible element (fixes #21)21bbeb2Fix bitrate field always being active regardless of selected preset (fixes #20)b5a6d8bFix camera player head being visible while in third persondd0537bCenter star between resolution fields in render settings guie35bfcaIncrease spacing between rows in the render settings gui6d0cdfbUpdate jGui (fixes #15)
This commit is contained in:
@@ -24,6 +24,7 @@ public abstract class AbstractTimelinePlayer {
|
||||
private final Minecraft mc = Minecraft.getMinecraft();
|
||||
private final ReplayHandler replayHandler;
|
||||
private Timeline timeline;
|
||||
protected long startOffset;
|
||||
private long lastTime;
|
||||
private long lastTimestamp;
|
||||
private ListenableFuture<Void> future;
|
||||
@@ -33,6 +34,11 @@ public abstract class AbstractTimelinePlayer {
|
||||
this.replayHandler = replayHandler;
|
||||
}
|
||||
|
||||
public ListenableFuture<Void> start(Timeline timeline, long from) {
|
||||
startOffset = from;
|
||||
return start(timeline);
|
||||
}
|
||||
|
||||
public ListenableFuture<Void> start(Timeline timeline) {
|
||||
this.timeline = timeline;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user