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

94 Commits

Author SHA1 Message Date
kruland2607
24a011b1e8 Manual edits to the new AeroTech C3 and D2 eng files to correct mass and 
delays.
 2013-10-03 12:27:15 -05:00
kruland2607
bba83fc795 Regenerate thrustcurve.ser again. 2013-09-24 11:12:19 -05:00
kruland2607
cece53c476 Added preliminary thrustcurves for AT C3 and D2. Removed the 
Loki_J175.rse provided by thrustcurve.org because it lists the wrong
type.
 2013-09-24 10:57:30 -05:00
Sampo Niskanen
f59c8012fb Release 13.09 2013-09-08 22:22:03 +03:00
kruland2607
faf238e61d Fix deployment event for dart's recovery. 2013-09-04 21:27:52 -05:00
kruland2607
54871ec674 Updated thrustcurves. 2013-09-03 14:41:34 -05:00
kruland2607
58e5874832 Merge remote-tracking branch 'upstream/master' into sims 
Conflicts:
	core/src/net/sf/openrocket/gui/main/SimulationPanel.java
 2013-06-11 21:25:33 -05:00
kruland2607
b5a191eb8d Added presets for LocPrecision contributed by Doug. 2013-06-07 06:38:24 -05:00
Sampo Niskanen
6b00c0a1e1 Version 13.05 2013-05-04 21:11:35 +03:00
kruland2607
c00a451704 Update the preset usage example. It has lost it's presets because it 
had been edited with a developer version of OR quite some time ago when
presets were broken.
 2013-05-03 12:06:00 -05:00
kruland2607
1e2c64b6f0 Fixed major problem with preset serialized database. They need to have 
a translator set correctly or else the material types will not match and
presets used in models will be cleared when the document is loaded.
 2013-04-25 21:51:43 -05:00
bkuker
3e57b36ffb Reduce built-in image sizes 2013-04-24 15:06:34 -04:00
bkuker
a649695423 Smaller simple sample 2013-04-24 14:47:19 -04:00
bkuker
6d12d265ac Smaller Examples 2013-04-24 14:41:08 -04:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -05:00
kruland2607
e25bb9b079 Updated apocalypse by moving motor tube to end of tail cone and adding 
rear centering right with appearance.  Added a motor and simulation.
 2013-04-01 15:16:45 -05:00
kruland2607
af7ef8360f Decorate the bottoms of all examples. 2013-03-29 00:22:18 -05:00
kruland2607
4362896139 Fixed the deployment of the booster chute and named the recovery 
devices.
 2013-03-27 00:24:57 -05:00
kruland2607
d6c4a0948d Updated database source files for presets and thrustcurves. 2013-03-13 23:31:50 -05:00
kruland2607
2cfd46760d Since it was decaled like a patriot, the dimensions were changed to more 
closely match a 1/2 scale rocket.
 2013-03-13 23:12:14 -05:00
kruland2607
c19a12b3b5 Rerun simulations on Three-stage rocket example so it the boosters use 
tumble recovery.
 2013-03-13 16:29:14 -05:00
bkuker
4d9b691a39 Update all of the examples with some nice decals & paint. 2013-03-13 16:44:20 -04:00
kruland2607
15f39a1d24 Update example with data branches for all stages. 2013-02-05 15:15:22 -06:00
kruland2607
055daf6786 Change ork format for ignition and motor configurations. Make them 
different xml elements preparing for an alternative api allowing them to
be more independent.
 2013-02-05 14:26:41 -06:00
Sampo Niskanen
8c0c9bb10d Plugin system 2013-01-23 08:32:09 +02:00
bkuker
05263e5056 An ok reusable motor appearance 2013-01-10 20:03:31 -05:00
bkuker
c1c4f99992 Trying out an "Unfinished" view... Jury is out 2013-01-10 15:36:08 -05:00
bkuker
03c9e24705 More appearances 2013-01-10 14:17:30 -05:00
bkuker
25a3fc1d05 Merge branch 'kruland-integration-motor' into 
kruland-integration-defaults

Conflicts:
	core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
 2013-01-10 08:46:20 -05:00
bkuker
28127b122d Simplify the default appearances. I am not ready to organize them into 
classes or factories or what have you, yet.
 2013-01-09 16:43:01 -05:00
bkuker
8dd0a6abc1 Initial tube & balsa default appearances 2013-01-09 14:42:38 -05:00
bkuker
ceb7d16651 Render motors nicely 2013-01-09 14:11:23 -05:00
bkuker
17ea631a9f Fix corrupted image 2013-01-08 09:22:57 -05:00
bkuker
e888ce9c63 Use Sticker method to draw all decals, to allow the transparency and 
paint interaction behavior you would expect.
 2013-01-07 18:57:28 -05:00
bkuker
7ead8bf977 Merge remote-tracking branch 'plaa/kruland-integration' into 
kruland-integration-stickers

Conflicts:
	core/src/net/sf/openrocket/appearance/SimpleAppearanceBuilder.java
	core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderStrategy.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
 2013-01-06 18:57:15 -05:00
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
bkuker
ab9dde913c Update Apocalypse to use Shine & Paint 2013-01-06 09:58:43 -05:00
bkuker
5985dba36a Stickers Example 2013-01-03 15:24:43 -05:00
bkuker
9d065c90e7 Cleanup Apocalypse example: 
Better decals
Non-weird flips
Moved some couplers that seemed off.
 2012-12-14 09:53:35 -05:00
kruland2607
2c7fcdb87c Regenerate the Apocalypse example file after changing the name of the 
ork file in the zip container.
 2012-12-12 22:27:04 -06:00
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