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

1897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bkuker
701aa4b151 Add thickness to a few components. 
Add an ALL surface
 2013-03-17 10:08:50 -04:00
bkuker
8b633bcd95 Refactor rendering a little, separating inside, outside and edge surfaces 
push geometry into a sub-package

Remove display lists

Force all calls to render geometry through a callback object

Switch to a design where I get individual Geometry callbacks. Easier to
deal with
 2013-03-17 10:07:55 -04:00
Sampo Niskanen
83fcf0894e Merge branch 'kruland-integration' of github.com:plaa/openrocket into kruland-integration-ui 2013-03-17 11:13:50 +02:00
Sampo Niskanen
b2776f5e92 UI refactoring 2013-03-17 11:13:32 +02:00
kruland2607
f4dce54312 Correct handling of ejectionCharges in getter and clone. 2013-03-16 20:49:02 -05:00
kruland2607
e8b9efd1d0 Merge remote-tracking branch 'upstream/kruland-integration-ui' into 
kruland-integration

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
 2013-03-16 18:35:31 -05:00
kruland2607
ed693edd00 Updated some documentation on file format. 2013-03-16 18:27:11 -05:00
kruland2607
c882ff2e19 Added fixme in version check. Need to add test for flight 
configurations.
 2013-03-16 18:21:27 -05:00
kruland2607
d6c4a0948d Updated database source files for presets and thrustcurves. 2013-03-13 23:31:50 -05:00
kruland2607
3d17930bc8 Updated motor thrust curve files from thrustcurve.org. 2013-03-13 23:30:16 -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
kruland2607
faf5f12d27 Clean up imports. 2013-03-13 16:22:40 -05:00
Bill Kuker
db286c3293 Merge pull request #47 from bkuker/kruland-integration-examples 
Add some paint and decals to most of the examples.
 2013-03-13 13:48:18 -07:00
bkuker
4d9b691a39 Update all of the examples with some nice decals & paint. 2013-03-13 16:44:20 -04:00
kruland2607
3eb96ee04d Merge branch 'tumble-recovery' into kruland-integration 
Conflicts:
	core/resources/datafiles/examples/Three-stage rocket.ork
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

Ignored changes to Three-stage rocket.ork since that will need to be
reproduced after the cool 3d view enhancements to the example.

The BasicEventSimulationEngine conflicts were trivial and manually
resolved.
 2013-03-13 14:34:11 -05:00
plaa
db7acc057f Merge pull request #44 from bkuker/latest-jogl 
JOGL 2.0-rc11
 2013-03-02 11:34:34 -08:00
bkuker
00a17eb0e2 Merge remote-tracking branch 'plaa/master' into latest-jogl 
Conflicts:
	core/.classpath
 2013-03-02 11:08:49 -05:00
Sampo Niskanen
d27a394813 Flight config dialog refactoring 2013-03-01 23:21:58 +02:00
kruland2607
4ff2eb11ec Removed ExampleDesignDialog which was replaced by the Open Example 
cascading menu.
 2013-03-01 10:56:08 -06:00
Sampo Niskanen
170ce13c05 Data model refactoring 2013-03-01 08:41:47 +02:00
Sampo Niskanen
4c48ec48c9 Merge branch 'kruland-integration' of github.com:plaa/openrocket into 
kruland-integration-ui

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java
 2013-02-23 08:51:22 +02:00
Sampo Niskanen
0e2ee6a566 Refactoring data model 2013-02-23 08:47:21 +02:00
kruland2607
0cfc8e6d28 Fixed AOA tumble condition. AOA is stored in radians not degrees. 2013-02-18 12:17:30 -06:00
kruland2607
526131a64c Implement tumbling based on the mathematics in techdoc.pdf. Change the 
conditions to transistion to tumbling to include aoa>30.
 2013-02-18 12:09:15 -06:00
kruland2607
f7def169ef Updated translation files from Boris du Reau. 2013-02-14 13:17:48 -06:00
kruland2607
31d6baffd4 Back out directory watcher code since we aren't using it yet. 2013-02-13 10:21:14 -06:00
kruland2607
fe3fe370fe Implement custom legend on the SimulationPlot which only displays a 
single entry for each type of series.  It no longer distinguishes among
the various stages.
 2013-02-12 13:54:50 -06:00
Sampo Niskanen
5161a0e967 Motor configuration dialog enhancements 2013-02-10 13:06:59 +02:00
kruland2607
eef2cbb5fa Added comments to createXYLineChart arguments. 2013-02-06 20:19:45 -06:00
kruland2607
a4efe4f3b9 Show data from the primary flight data branch in each of the stages 
prior to stage separation.
 2013-02-05 15:20:56 -06:00
kruland2607
15f39a1d24 Update example with data branches for all stages. 2013-02-05 15:15:22 -06:00
kruland2607
86cda58483 Part of previous commit changing file format for ignition configuration. 2013-02-05 15:13:37 -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
kruland2607
b16917995d Change mouse button handling in simulation plot. Left click drag zooms 
area, and ctrl left click drag pans.
 2013-02-05 10:04:49 -06:00
kruland2607
06e702839f Implement clamping in while panning. Don't allow panning past the min 
or max.
 2013-02-04 14:41:02 -06:00
kruland2607
d9c0f68e64 Remove a bunch of commented out code. 2013-02-04 14:37:18 -06:00
kruland2607
cec784d77e Update ResourceDecalImage to match new DecalImage interface. 2013-02-03 20:23:24 -06:00
kruland2607
4cdf03075b Make DecalImage no longer inherit from Attachment. It seems less 
confusing since a DecalImage cannot be used in place of Attachments in
general.  Made Attachment a concrete class.
 2013-02-03 20:19:03 -06:00
Sampo Niskanen
18e58199e6 Merge branch 'master' of git@github.com:plaa/openrocket.git 2013-02-02 12:34:05 +02:00
Sampo Niskanen
be67cad964 Fix default units (issue #32) 2013-02-02 12:33:49 +02:00
Sampo Niskanen
4d134181f2 Lower stage optimization files 2013-02-02 12:07:49 +02:00
Sampo Niskanen
d2035ce702 UI updates 2013-02-02 12:07:07 +02:00
Bill Kuker
405f0db1b7 Merge pull request #39 from bkuker/kruland-integration-defaults 
Add Default appearances
 2013-02-01 15:36:08 -08:00
Sampo Niskanen
3b7e1fcc3a Technical documentation update on lower stages 2013-01-30 23:38:38 +02:00
Sampo Niskanen
b3b2303f27 Enhance flight configuration UI 2013-01-27 22:36:21 +02:00
bkuker
5f712a7b77 Merge remote-tracking branch 'plaa/master' into latest-jogl 2013-01-27 15:02:37 -05:00
bkuker
e7a7a5fbc9 JOGL 2.0-rc11 2013-01-27 15:01:15 -05:00
bkuker
fd5d86744f Minor cleanup 2013-01-27 10:17:07 -05:00
plaa
3eccae0fc7 Merge pull request #38 from kruland2607/bug-print-fin-template 
Fix bug with fin marking guide.  If a rocket has some split fins
 2013-01-27 01:51:07 -08:00