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

3470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sampo Niskanen
4a0960e4f6 Clean up spurious decimals from Klima thrust curve files 2014-05-18 12:46:14 +03:00
Sampo Niskanen
da8910a0ba Add Klima motor files 2014-05-18 12:41:34 +03:00
Sampo Niskanen
2c64e83a6f TODO 2014-05-18 12:35:11 +03:00
kruland2607
4d4acee6de Merge pull request #198 from kruland2607/override-indicators 
Override indicators
 2014-05-15 14:56:20 -05:00
kruland2607
12c47442f3 Renamed the cg-marker.png to cg-override.png. 2014-05-08 09:08:27 -05:00
kruland2607
bef5ff4f4a Merge remote-tracking branch 'upstream/master' into override-indicators 2014-04-24 09:46:10 -05:00
kruland2607
33af46a105 Added mass-override.png icon. 2014-04-24 09:42:00 -05:00
kruland2607
812e50b8ae Merge pull request #197 from kruland2607/master 
Upon further research the estes nc data contained incorrect PNC-80FB
 2014-04-24 09:10:17 -05:00
kruland2607
ae64f7a7f9 CG & Mass override indicators in component tree. 2014-04-23 21:22:43 -05:00
kruland2607
cc5340ca46 Upon further research the estes nc data contained incorrect PNC-80FB 
part which does not exist.
 2014-04-23 15:15:38 -05:00
kruland2607
455335270d Merge pull request #196 from kruland2607/optimum-delay 
Implement feature to compute the optimum delay for a simulation.
 2014-04-15 09:38:49 -05:00
Sampo Niskanen
cc6a39c34d Remove test code 2014-04-12 10:56:42 +03:00
Sampo Niskanen
b6e3a57b47 Implement simulation extensions 
Squashed commit of the following:

commit 058f603c23accbcdbe9110645f19164da7d57c85
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Sat Apr 12 10:52:21 2014 +0300

    Implmenent simulation extensions

commit a1ca913c7d7793a9209a5f98235336270db6ce10
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Fri Apr 11 19:45:12 2014 +0300

    WIP

commit 916f0bc8961360c0906b413485ca4e3700033740
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Tue Apr 1 20:23:25 2014 +0300

    WIP
 2014-04-12 10:54:17 +03:00
kruland2607
a34d41d6af Implement feature to compute the optimum delay for a simulation. 2014-04-08 13:09:38 -05:00
kruland2607
9a85ba0099 Added simple mass indicator. 2014-04-08 08:31:21 -05:00
kruland2607
4565cdcd86 Merge pull request #192 from kruland2607/master 
Bug fix in motor seleciton panel and new jogl libs
 2014-03-31 09:17:25 -05:00
kruland2607
6e2708b6ac Updated jogl libraries to 2.1.5. 2014-03-25 12:13:47 -05:00
kruland2607
581ec324d9 Fix selection bug in motor selection panel. The app threw NPE when 
trying to reuse the dialog.
 2014-03-25 12:12:30 -05:00
kruland2607
11328bc1fc Prepare for dev release. 2014-03-19 16:59:15 -05:00
kruland2607
ae36404431 Changes for 14.03 Release. release-14.03 2014-03-19 15:54:22 -05:00
kruland2607
ddc04b00a0 Merge pull request #191 from CarVac/master 
Fixed an OpenGL error; just a stopgap it seems.
 2014-03-18 21:35:56 -05:00
CarVac
708323af73 Fixed an OpenGL error; just a stopgap it seems. 2014-03-18 19:17:03 -04:00
kruland2607
790999ea68 Merge pull request #190 from kruland2607/master 
Updated AT F44, G74, J170 and GR O2700 thrustcurves.
 2014-03-18 14:01:56 -05:00
kruland2607
81739c340f Updated AT F44, G74, J170 and GR O2700 thrustcurves. 2014-03-18 13:59:09 -05:00
kruland2607
5a549495b7 Updated thrustcurve serialized file. 2014-02-27 20:42:24 -06:00
kruland2607
8d7039995f Added YourKit support announcement to the front page. 2014-02-27 20:38:11 -06:00
kruland2607
a2e1a67145 Merge pull request #183 from kruland2607/master 
Updated Spanish translation and thrustcurves.
 2014-02-27 20:33:14 -06:00
kruland2607
faead389b0 Added YourKit support announcement to the front page. 2014-02-27 20:30:30 -06:00
kruland2607
3993bc481d Updated thrustcurves from thrustcurve.org. 2014-02-26 21:34:27 -06:00
kruland2607
836eb92cd6 Update Spanish translation file. 2014-02-26 21:18:46 -06:00
kruland2607
bd62a1ee24 Merge pull request #181 from bkuker/tumble 
Changes to Tumble Transition & Tumble Bug Fix
 2014-02-25 17:29:25 -06:00
kruland2607
bb0be8da6f Merge pull request #182 from enderw88/master 
Prevent NPE when an uninitialized table cell is rendered.
 2014-02-25 17:26:05 -06:00
Craig Earls
cc54a98226 Prevent NPE when an uninitialized table cell is rendered. 2014-02-25 14:58:24 -07:00
bkuker
8e063f0a64 The changes to the tumble transition discussed on or-dev 2014-02-25 15:39:12 -05:00
bkuker
7c72bc88b1 Fix BasicTumbleStatus to initialize drag to non-zero. 
computeTumbleDrag() is never called without this fix.

The one-arg constructor is the only constructor ever used, to init this
status based on the previous status, copying the tumble drag if it can.

The first BasicTumbleStatus is constructed from an RK4 Status, so it's
drag is not copied, but neither is the drag computed. From then on the 0
is copied from one BasicTumbleStatus to the next.
 2014-02-25 09:51:03 -05:00
kruland2607
f5d09233e8 Merge pull request #180 from kruland2607/master 
Fix various bugs in flight configurations
 2014-02-17 15:13:00 -06:00
kruland2607
d1ea0e3e63 Fix some annoying selection issues by moving some code into the base 
class.
 2014-02-12 21:49:45 -06:00
kruland2607
b61ee0c5ab Use the selectMotor method to update the whole ui and ensure that one 
can add a new motor.
 2014-02-12 21:48:10 -06:00
kruland2607
730abea70b Fix problematic bug in motor selection which manifested as: 
java.lang.IllegalArgumentException: setSelectedIndex: 0 out of bounds
	at javax.swing.JComboBox.setSelectedIndex(Unknown Source)
	at
net.sf.openrocket.gui.dialogs.motor.thrustcurve.ThrustCurveMotorSelectionPanel.updateData(ThrustCurveMotorSelectionPanel.java:437)

The underlying problem was the MotorChooserDialog had been using the
GUIUtil.setDisposableDialogOptions call which caused all the underlying
models to be cleared when the dialog was closed with the "x" button.
This caused the reference to the models in the panel to be disassociated
with those in the swing widgets.

Since the dialog is reused, this behavior was bad.  Changed the dialog
so the 'x' button simply hides the dialog and use the
GUIUtil.installEscapeCloseOperation to wire in the ESC key.
 2014-02-12 10:31:46 -06:00
kruland
11a59e0759 Remove FIXME comment since it was addressed by the previous commit which 
modified the epsilon to check for equality in y points.

Removed a bunch of vertical whitespace.
 2014-02-04 08:11:26 -06:00
kruland2607
062dbb7a4c Merge pull request #179 from plaa/master 
Replace lake.png with lake.jpg
 2014-02-04 05:51:50 -08:00
Sampo Niskanen
d4ba3eba01 Replace lake.png with lake.jpg 2014-02-02 13:28:52 +02:00
Bill Kuker
ba4056b99c Merge pull request #178 from bkuker/slf-message-fix 
Fix SLF "{}" substitution in Debug log & Error reports
 2014-02-01 17:13:42 -08:00
bkuker
81f5cfee4a Store the formatted log message, with "{}"s substituted. 2014-02-01 17:15:50 -05:00
plaa
3724934615 Merge pull request #177 from plaa/plaa-master 
Remove non-ascii chars from java files
 2014-02-01 01:04:35 -08:00
Sampo Niskanen
e2699a16ea Remove non-ascii chars from java files 2014-02-01 10:59:34 +02:00
kruland2607
5905bc9cf0 Merge pull request #176 from bkuker/photobooth-split 
3D Photo Studio
 2014-01-31 20:32:01 -08:00
bkuker
b7b0ca002f Turn smoke off by default. 
If shader is screwed up on someone's system they won't get the error
until they turn it on, rather than the photo just failing right away.
 2014-01-31 17:43:36 -05:00
bkuker
9f13119317 Draw flames only for bottom most stage. 2014-01-31 09:25:22 -05:00
bkuker
1d38fb93db Apply translation to photo studio 2014-01-26 16:05:57 -05:00