New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New features #22
Open
nickkolok
wants to merge
107
commits into
OpenSourcePhysics:master
Choose a base branch
from
nickkolok:master
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
New features #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: src/org/opensourcephysics/cabrillo/tracker/PrefsDialog.java src/org/opensourcephysics/cabrillo/tracker/TMenuBar.java src/org/opensourcephysics/cabrillo/tracker/Tracker.java src/org/opensourcephysics/cabrillo/tracker/TrackerIO.java src/org/opensourcephysics/cabrillo/tracker/deploy/TrackerStarter.java src/org/opensourcephysics/cabrillo/tracker/resources/tracker_de.properties
Conflicts: src/org/opensourcephysics/cabrillo/tracker/ExportVideoDialog.java src/org/opensourcephysics/cabrillo/tracker/PrefsDialog.java src/org/opensourcephysics/cabrillo/tracker/TFrame.java src/org/opensourcephysics/cabrillo/tracker/TMenuBar.java src/org/opensourcephysics/cabrillo/tracker/TTrackBar.java src/org/opensourcephysics/cabrillo/tracker/Tracker.java src/org/opensourcephysics/cabrillo/tracker/TrackerIO.java src/org/opensourcephysics/cabrillo/tracker/TrackerPanel.java src/org/opensourcephysics/cabrillo/tracker/deploy/TrackerStarter.java src/org/opensourcephysics/cabrillo/tracker/resources/tracker.properties src/org/opensourcephysics/cabrillo/tracker/resources/tracker_de.properties
# Conflicts: # src/org/opensourcephysics/cabrillo/tracker/PrefsDialog.java # src/org/opensourcephysics/cabrillo/tracker/SpectralLineFilter.java # src/org/opensourcephysics/cabrillo/tracker/Tracker.java # src/org/opensourcephysics/cabrillo/tracker/Undo.java # src/org/opensourcephysics/cabrillo/tracker/deploy/TrackerStarter.java
# Conflicts: # src/org/opensourcephysics/cabrillo/tracker/Tracker.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverse stepping (just set a negative step value in the bottom dropdown menu)
Automatic skipping of uncertain autotracker matches (configurable)
Increased speed of autotracking
Fixed a Linux-specific lag (up to 10 seconds when opening the autotracker)
Custom decimal separators (e.g., both commas and dots/points)
Needs the corresponding patch for
osp
repo.This version is based of
ffmpeg
version of Tracker.