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

54 Commits

Author SHA1 Message Date
Sampo Niskanen
5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket 
Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
 2012-12-11 08:38:59 +02:00
Sampo Niskanen
49858f589f Update thrust curve files 2012-12-10 23:30:56 +02:00
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +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
eb20d0e72e Added descriptions, author and rocket names to new examples. 2012-10-26 11:57:36 -05:00
kruland2607
36558e60a2 Updated the Boosted Dart example to have two different stage 
separations.
 2012-10-24 22:29:10 -05:00
batwings
fc2fd2a011 Merge branch 'feature-stagerecovery' into integration 
Conflicts:
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
 2012-10-24 10:22:48 -05:00
batwings
5d65b591e1 Merge branch 'feature-rocketconfig' into integration 
Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
 2012-10-24 09:26:29 -05:00
Kevin Ruland
e78f5b27f1 Added example file with decals. 2012-10-23 16:23:09 -05:00
Kevin Ruland
d0569e5759 Fixed loading decals from example file. Added FileInfo class which is used to describe data about the file - what the URL is to it and it's parent directory (if appropriate). The FileInfo class is pushed into the DecalRegistry to facilitate loading decals from the correct location. Added the Apocalypse with decals as an example file. 2012-10-23 16:13:35 -05:00
kruland2607
a5d87244a4 Implemented flight data branches for stage recovery. Updated jfreechart 
to 1.0.14 and jcommon to 1.0.17.  Added primitive support for plotting
all databranches.
 2012-10-23 10:57:00 -05:00
kruland2607
8588918452 Updated HPR Airstart example. 2012-10-19 16:01:11 -05:00
kruland2607
6d190095a7 Example HPR with airstarted cluster. 2012-10-19 14:44:51 -05:00
kruland2607
7f6c542e5d Try to use Java Serializable to improve loading of included 
ComponentPresets.
 2012-10-09 09:07:18 -05:00
Sampo Niskanen
cf68f13590 Release 12.09 2012-09-16 14:29:59 +00:00
Kevin Ruland
f5241b85cd Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II. 2012-09-12 02:33:21 +00:00
Kevin Ruland
3e92068515 Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II. 2012-09-12 02:30:46 +00:00
Kevin Ruland
89a83d54fc Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II. 2012-09-12 01:53:50 +00:00
Kevin Ruland
265b588035 Updated 3FNC Using Presets example so it uses the presets currently deployed and does not issue a warning message. 2012-08-29 13:45:56 +00:00
Kevin Ruland
18fa60f844 Rolled back previous attempt at un-localizing sample files. New approach will not use this file format. 2012-08-06 13:32:52 +00:00
Kevin Ruland
77e3652249 De-localize Material and FlightDataType objects when persisting in ork files. Added a String key to each of these objects which holds on to a unique identifier which is stored in the ork file. User defined Materials are given a key which is defined as "UserDefined." + name. 
The construction pattern for Material has changed so explicitly passing in the userDefined boolean is no longer required.  Instead there are two different factory methods to be used.  Direct construction of Material derived classes is no longer allowed.

The persistence mechanism for Materials in perferences has changed.  It will now persist the key and name but still supports reading old format.

The example files have been regenerated, but will need to be regenerated again prior to an official build in order to get the version string correct.
 2012-07-31 21:20:55 +00:00
Kevin Ruland
5f02647c6f Correct spelling in description. 2012-07-20 03:34:18 +00: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
487a9238de Added Estes E12 data file found on The Rocketry Forum. 2012-07-12 02:50:54 +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
97fea90360 Added example file using presets. 2012-05-11 03:19:55 +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
Kevin Ruland
255c6771dd Don't support a CG override in components. When using a nose conet preset, compute the density from the mass and use this in conjuction with the material. 2012-04-13 01:57:46 +00:00
Kevin Ruland
b850d6615f First cut at making component presets work for nose cones. 2012-04-12 05:55:07 +00:00
Kevin Ruland
b1d040a964 Fix dimentions on last record in table. 2012-04-03 03:36:06 +00:00
Kevin Ruland
51e6bf9d44 Fix the header and type name to match new parsing. 2012-04-02 01:32:09 +00:00
Kevin Ruland
ec4a782779 Fix dimentions in sample preset file. 2012-04-02 01:17:01 +00:00
Sampo Niskanen
70e7936454 Updates and fixed to preset handling 2012-04-01 19:16:25 +00:00
Kevin Ruland
6de0ea7083 Initial work on BodyTube ComponentPresets. 2012-03-29 02:47:49 +00:00
Sampo Niskanen
5fb724ff35 Release 12.03 2012-03-17 21:13:09 +00:00
Sampo Niskanen
453d977faf Guided tour updates 2012-03-17 20:19:52 +00:00
Sampo Niskanen
e3b27743b6 Guided tour updates 2012-03-17 20:18:49 +00:00
Sampo Niskanen
a406956b06 Guided tour updates 2012-03-10 15:03:02 +00:00