hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,260 Commits 2 Branches 43 Tags
Commit Graph

2260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
94ff7d7b50 Merge pull request #313 from teyrana/add-mac-ignore 
[add] Added */.DS_Store to .gitignore file
 2016-12-21 18:27:00 -06:00
Daniel_M_Williams
9034b23386 [add] Added */.DS_Store to .gitignore file 2016-12-20 12:47:48 -05:00
kruland2607
597d6c8391 Merge pull request #290 from teyrana/warning-cleanup 
Warning cleanup ( reduced from 219 to 185 )
 2016-11-19 08:31:11 -06:00
kruland2607
e4aae02455 Merge pull request #292 from teyrana/unit-comment-fix 
Unit comment fix [single-file][non-functional][mini]
 2016-11-19 08:29:26 -06:00
kruland2607
786998f054 Merge pull request #306 from matt-kendall/pods-boosters-units 
Remove calls to model.setCurrentUnit in Booster and Pod configs which…
 2016-11-19 08:26:00 -06:00
kruland2607
53fcd60df3 Merge pull request #307 from matt-kendall/tube-fins-icon 
Remove opaque background from Tube Fin Component Icon
 2016-11-19 08:25:39 -06:00
Matt Kendall
3642398b1a Remove opaque background from Tube Fin Component Icon 2016-11-05 23:55:31 +00:00
Matt Kendall
af18606eb9 Remove calls to model.setCurrentUnit in Booster and Pod configs which are changing the default units of some fields in the config panels 2016-11-05 17:50:02 +00:00
kruland2607
b278adecbf Merge pull request #303 from teyrana/fix-motor-display 
[fix] Redraw Rocket Figure when motors are added & removed
 2016-11-04 15:00:25 -05:00
Daniel_M_Williams
8c8e8b1305 [fix] Rocket Figure now redraws when motors are added & removed 2016-10-29 12:27:15 -04:00
kruland2607
9da4a17a43 Merge pull request #302 from kruland2607/unstable 
rendering bugs and small problems in pods example
 2016-10-26 19:47:08 -05:00
Kevin Ruland
a082e8a24b Resave the Pods Example to get rid of older attribute. 2016-10-26 19:46:00 -05:00
Kevin Ruland
f390d1f305 Fix PodSet Rendering. 2016-10-26 19:42:16 -05:00
Kevin Ruland
10bd864ef6 Fix 3d rendering issues with AxialStage and ParallelStage. Renamed 
example to get rid of underscores.
 2016-10-26 18:39:10 -05:00
Luiz Victor Linhares Rocha
37402f9b95 adds documentation and refactoring for ThrustCurveMotorSet file 2016-10-24 15:33:02 -02:00
Luiz Victor Linhares Rocha
3fc4c3799c adds documentation for database package 2016-10-24 14:48:05 -02:00
Luiz Victor Linhares Rocha
f0ecd6f495 adds documentation written before update 2016-10-24 11:05:08 -02:00
kruland2607
25a249ee27 Merge pull request #299 from kruland2607/unstable 
merge master into unstable.
 2016-10-23 13:55:41 -05:00
Kevin Ruland
4532ba6490 Merged master into unstable. 2016-10-23 13:50:33 -05:00
Kevin Ruland
f2d76e3b2b Merge remote-tracking branch 'upstream/master' into unstable 2016-10-23 13:50:08 -05:00
kruland2607
f5acd0ab1c Merge pull request #298 from kruland2607/unstable 
Added case-info to motors.
 2016-10-23 13:21:24 -05:00
Kevin Ruland
d3240ec1a4 Merge remote-tracking branch 'upstream/unstable' into unstable 2016-10-23 13:16:06 -05:00
kruland2607
ad9d099746 Merge pull request #289 from Vicilu/DocumentationVicilu 
adds documentation to aerodynmics package
 2016-10-23 12:19:27 -05:00
kruland2607
f890402756 Merge pull request #297 from teyrana/fix-issue-294 
Fix issue #294
 2016-10-23 12:18:51 -05:00
Daniel_M_Williams
02aefc6b6e [fix] Fixed RocketTest Failure 2016-10-22 22:58:41 -04:00
Daniel_M_Williams
c556cf93a7 [fix] Cloned flight Configurations now display correct name 2016-10-22 22:58:41 -04:00
Daniel_M_Williams
443b4b9a35 [Doc] Updated function Javadocs 2016-10-22 22:58:41 -04:00
Daniel_M_Williams
6d70cc61f1 [Fix][Issue #294] Multiple fixes to ensure undo & redo function correctly 
- The Rocket#trackStages function needs to handle being updated with the same stage id#, but different instance
- Rocket#update now updates the stageMap
- FlightConfigurations refactored to use stage numbers instead of references.
 2016-10-22 22:58:23 -04:00
Daniel_M_Williams
31938d69d7 [refine] removed ~40% excess configuration clones while creating undo point. 2016-10-22 18:56:39 -04:00
Luiz Victor Linhares Rocha
9f10b8cec1 adds documentation to some document package and rocketcomponents 2016-10-19 15:22:28 -02:00
Daniel_M_Williams
1c326c88c3 [fix] fixed MotorConfiguration copy constructor to copy motor as well 2016-10-17 21:46:30 -04:00
Daniel_M_Williams
746024cced [minor] renamed constructor variable to correctly indicate purpose 2016-10-17 21:44:24 -04:00
Daniel_M_Williams
f3413f9a98 [Minor] Removed extra whitespace in debug statements 2016-10-17 21:43:11 -04:00
Luiz Victor Linhares Rocha
b708520364 adds documentation and refactoring for many files 2016-10-17 16:41:17 -02:00
Vicilu
7c5de3f4da adds documentation for appearance builder 2016-10-14 11:50:58 -03:00
Vicilu
466619d296 Adds documentation to appearance file 2016-10-14 11:00:11 -03:00
Daniel_M_Williams
445e6caac3 [Refactor] Rocket inherits from ComponentAssembly instead of RocketComponent 
- conceptually, a rocket *IS A* ComponentAssembly.
- reduces code duplication:  7 redundant functions
- rocket still inherits all the RocketComponent methods

- Also:  changed Coordinate.NUL -> Coordinate.ZERO to better reflect our intent.
-- Nitpick: Coordinate.NUL is *not* null. It's zero.  These are different!
-- Null is an error condition.
-- Zero is a valid coordinate.  Zero means something is located at the origin.  Like the rocket, and the nosecone.
 2016-10-13 16:30:42 -04:00
Daniel_M_Williams
59a596520a [Non-func] Removed dead code, reformatted comments for javadoc 2016-10-13 16:06:01 -04:00
Daniel_M_Williams
93ccc180b8 [Cleanup][Warnings][Non-Func] Fixes numerous but trivial warnings 
Warnings fixed:
-"JComboBox is a raw type. References to generic type JComboBox<E> should be parameterized"
-- fix: Add a <T> type specifier to each generic, (or occasionally <?>)

- "The serializable class WarningDialog does not declare a static final serialVersionUID field of type long"
-- fix: add annotation: '@SuppressWarnings("serial")'

- "Unnecessary @SuppressWarnings("unchecked")"
-- fix: remove annotation
 2016-10-13 15:54:26 -04:00
Luiz Victor Linhares Rocha
38f21e1b05 fixes build bug by non ASCII character 2016-10-13 15:47:53 -03:00
Luiz Victor Linhares Rocha
ecb467db36 fixes little bug found at github build and adds a little more docs 2016-10-13 15:42:08 -03:00
Luiz Victor Linhares Rocha
c9dadc10fa adds documentation to aerodynmics package and some refactoring of classes 2016-10-13 15:04:03 -03:00
Kevin Ruland
e0c7c34cb0 Fixes from unit tests. 
Don't serializemotors during ci builds.  This will likely pound
thrustcurve.org too much.  Couple of bugs found by unittests :)
 2016-10-11 16:23:39 -05:00
Kevin Ruland
6532743c3f Revising previous commit to include the missing files. 2016-10-10 19:50:17 -05:00
kruland2607
aeb2a3cd97 Merge pull request #286 from Vicilu/addDoxy2 
adds doxyfile for doxygen documentation
 2016-10-10 17:27:46 -05:00
Kevin Ruland
f121def910 Significantly modified management of motor information provided by 
OpenRocket.  At build time, it will utilize the Thrustcurve.org xml api
to download the current information (curve files and supplemental
information).  OpenRocket uses the supplemental information to populate
case-info, propellant type, availability as well as correct diameters
and length. Modified motor search dialog to hide unavailable motors and
show case-info.
 2016-10-10 17:27:25 -05:00
Luiz Victor Linhares Rocha
e05062e389 adds doxyfile for doxygen documentation 2016-10-10 18:02:48 -03:00
kruland2607
05d439bd1e Merge pull request #280 from teyrana/axialoffsetfix 
[Refactor] Replaced redundant method: 'PositionValue(...)' with 'AxialOffset(...)'
 2016-10-07 19:28:17 -05:00
kruland2607
d837bbbe22 Merge pull request #279 from Vicilu/viciluChange 
fixes tests giving false negative for comma decimal locale
 2016-09-28 14:25:09 -05:00
kruland2607
b158485a2d Merge pull request #281 from teyrana/massfix 
Cleaning up the code from: PR #273
 2016-09-28 14:23:47 -05:00