Sampo Niskanen
|
ef7c384f58
|
Merge branch 'master' into kruland-integration
Conflicts:
core/build.xml
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
core/src/net/sf/openrocket/gui/main/BasicFrame.java
core/src/net/sf/openrocket/gui/util/SaveFileWorker.java
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
|
2013-01-06 19:18:46 +02:00 |
|
Sampo Niskanen
|
42b4eeac31
|
Merge branch 'feature-improvepresetloading' of
github.com:kruland2607/openrocket
Conflicts:
core/build.xml
Optimize motor loading further
|
2012-12-06 12:49:00 +02:00 |
|
kruland2607
|
bd66cc9338
|
Use Serializable representation of system supplied motors in jar file.
this greatly improves startup performance.
|
2012-10-28 11:26:40 -05:00 |
|
kruland2607
|
7f6c542e5d
|
Try to use Java Serializable to improve loading of included
ComponentPresets.
|
2012-10-09 09:07:18 -05:00 |
|
Kevin Ruland
|
92f40fec79
|
Added Estes and Quest components from Bill Carpenter's rocksim csv files.
|
2012-07-13 03:26:35 +00:00 |
|
Kevin Ruland
|
1fcf661ff3
|
Added fliskits component catalog. Collected by hand entry from web and submitted by bill carpenter.
|
2012-06-06 20:19:20 +00:00 |
|
Kevin Ruland
|
0c9ac572d1
|
Regenerated preset files.
|
2012-05-07 01:35:18 +00:00 |
|
Kevin Ruland
|
3792528e01
|
Added LaunchLug, Streamer and Parachute ComponentPresets.
|
2012-05-01 17:40:55 +00:00 |
|
Kevin Ruland
|
fea3e6e61a
|
Fix giantleaprocketry's TCData.csv, added it to the build.xml and committed the generated orc file.
|
2012-04-29 02:43:55 +00:00 |
|
Kevin Ruland
|
ca52cc6612
|
Rebuilt orc files with new parser and orc format.
|
2012-04-27 20:12:54 +00:00 |
|
Kevin Ruland
|
1acc99b163
|
Switch component preset loading from using the temporary csv format to orc formatted files. Added orc formatted files to the resources/datafiles/presets for all vendors which have approved inclusion of their files in OpenRocket. Removed the old csv parser and the hand crafted csv files for semroc presets.
|
2012-04-26 21:14:38 +00:00 |
|
Kevin Ruland
|
27411395f9
|
Change nose cone preset to use Aft Outer Diameter, Aft Shoulder Length, and Aft Shoulder Diameter to be consistent with Transitions. Added a bunch of unit tests and correct behavior of the rocketcomponent setters to clear the preset appropriately. Modified the temporary csv data files to use the "aft" specifiers.
|
2012-04-22 20:26:22 +00:00 |
|
Kevin Ruland
|
0ec9a1531f
|
Mark bulkheads as filled.
|
2012-04-19 16:02:30 +00:00 |
|
Kevin Ruland
|
ce543e485e
|
Added semroc centering rings and engine blocks.
|
2012-04-18 19:46:36 +00:00 |
|
Kevin Ruland
|
1184c698be
|
Added support for TubeCoupler.
|
2012-04-16 20:17:38 +00:00 |
|
Kevin Ruland
|
d1c83cb9b4
|
Refactored the ComponentPreset.create method into the ComponentPresetFactory object to make code maintenance easier. Added support for Bulk heads.
|
2012-04-16 19:18:25 +00:00 |
|
Kevin Ruland
|
9d467dafba
|
Implement Transition preset components.
|
2012-04-13 19:39:33 +00:00 |
|
Kevin Ruland
|
08d1fccf66
|
Relocate the preset files from datafiles/ to datafiles/presets/.
|
2012-04-13 19:38:23 +00:00 |
|