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

1420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sampo Niskanen
fcfa53ac05 Update wiki URL 2013-09-08 21:12:04 +03:00
kruland2607
788301be81 Merge pull request #135 from kruland2607/simexport 
Added ability to export different branches from simulations.  Change the ok button text based on selected tab.
 2013-09-06 07:26:43 -07:00
kruland2607
3538a3ac9a Change the ok button text to "Plot" or "Export" based on selected tab. 2013-09-06 09:25:57 -05:00
kruland2607
0bba32fb59 Added ability to export different branches from simulations. 2013-09-05 10:14:48 -05:00
kruland2607
3088ee08aa Merge pull request #134 from kruland2607/master 
Doh! forgot to add the new jfreechart libs.
 2013-09-04 19:43:23 -07:00
kruland2607
7285ce0f6e Doh! forgot to add the new jfreechart libs. 2013-09-04 21:43:04 -05:00
kruland2607
e7ff1b036b Merge pull request #133 from kruland2607/master 
Fixed build for new library version numbers.
 2013-09-04 19:39:53 -07:00
kruland2607
152662613b Fixed build for new library version numbers. 2013-09-04 21:39:34 -05:00
kruland2607
12847a1be9 Merge pull request #130 from kruland2607/jfreechart-1.0.15 
Fix for Issue #114
 2013-09-04 19:33:31 -07:00
kruland2607
e2675ecd37 Merge pull request #131 from kruland2607/master 
Fix deployment event for dart's recovery.
 2013-09-04 19:28:50 -07:00
kruland2607
faf238e61d Fix deployment event for dart's recovery. 2013-09-04 21:27:52 -05:00
kruland2607
067031db3b Fixed problem with multiple copies of the same series in a plot. Also 
bumped up to jfreechart 1.0.15 but that might not have been necessary.
 2013-09-04 21:01:40 -05:00
kruland2607
5239123f6c Merge pull request #129 from kruland2607/fixdecaldropdown 
Fix for issue #116
 2013-09-03 18:54:24 -07:00
kruland2607
45ef3064fd Improve refreshing the decal model by doing it whenever the underlying 
appearance changes.  This allows for "From file" to work correctly as
well.
 2013-09-03 20:32:55 -05:00
kruland2607
5b9af6de3b Merge pull request #128 from openrocket/issue-118 
Catch UnsupportedOperationExceptions from getDesktop.
 2013-09-03 17:31:58 -07:00
kruland2607
375f371702 Add a little more protection in getElementAt because Apples' LAF 
sometimes returns -1.
 2013-09-03 16:16:15 -05:00
kruland2607
0f5e784e64 Catch UnsupportedOperationExceptions from getDesktop. 2013-09-03 16:13:04 -05:00
kruland2607
4c3a16f02b Refresh the texture drop down contents when one edits a single copy of a 
decal
 2013-09-03 14:53:51 -05:00
kruland2607
e9be0ad9ef Merge pull request #127 from openrocket/thrustcurves 
Updated thrustcurves.
 2013-09-03 12:47:16 -07:00
kruland2607
54871ec674 Updated thrustcurves. 2013-09-03 14:41:34 -05:00
bkuker
11c5e072f0 Fix for Issue #122, NPE in RocketFigure3d.setType() 
This problem will only happen when the RocketFigure3d is unable to
create a GL canvas. It sets the canvas to null, but not all code that
uses canvas checks for null. This class probably should handle this
state better than it does, but this is the safe change now.
 2013-09-02 18:46:58 -04:00
bkuker
0bc139fd05 Fix issue #112, NPE in RocketFigure3d mouseDragged() 
The component can pick up a mouse drag event without a mouse press event
if the mous is clicked and dragged while a modal dialog is open. The
running simulations progress bar dialog is an example. To fix, do not
process a mouse drag if a mouse press has not been recorded.
 2013-09-02 18:29:30 -04:00
kruland2607
265fdfe05e Merge pull request #111 from bkuker/jogl-v2.0.2-RELEASE 
Upgraded JOGL to version 2.0.2
 2013-08-21 22:00:46 -07:00
kruland2607
a05c08ac8b Merge pull request #110 from kruland2607/master 
Added some logging to help diagnose NPE bug reports
 2013-08-21 21:58:54 -07:00
bkuker
0d88fbef99 Upgraded JOGL to version 2.0.2 2013-08-18 14:27:16 -04:00
kruland2607
9e16bc8530 Added some logging to help diagnose NPE bug reports from 
ExampleDesignFileAction.
 2013-08-17 19:32:47 -05:00
kruland2607
0775f780dd Merge pull request #109 from kruland2607/fix-decalimageedit 
Fix for issue #108
 2013-08-17 17:31:40 -07:00
kruland2607
24706294ec Remove the mysterious first element of the EdgeMode drop down. 2013-08-17 19:16:10 -05:00
kruland2607
1398fe0794 Fix issue where edited decal was lost when the appearance was modified 
again.
 2013-08-17 19:12:28 -05:00
kruland2607
e6c2181c11 Merge pull request #107 from kruland2607/master 
Fix simulation plot dialog logic.
 2013-07-05 21:38:53 -07:00
kruland2607
79ee38f518 Fix logic used to open Plot vs Run dialog. Only plot when there is data 
which is up to date or external.
 2013-07-05 23:37:35 -05:00
Sampo Niskanen
dbcd6b5c6a Rename button to "Plot" in plot dialog 2013-06-13 22:42:15 +03:00
Sampo Niskanen
0114448ea8 Fine-tune SimulationEditDialog 2013-06-13 16:54:01 +03:00
Sampo Niskanen
92ae04f85a Merge remote-tracking branch 'kruland/sims' 2013-06-13 15:42:45 +03:00
kruland2607
a67bd1add6 If the simulation runs correctly, then switch to plot view. 2013-06-11 21:28:59 -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
Jeff Davis
bd43432aa7 Merge pull request #103 from soupwizard/master 
Minor edits to README.md
 2013-06-08 21:23:27 -07:00
soupwizard
d2dabc040c Merge branch 'master' of https://github.com/soupwizard/openrocket 2013-06-08 21:12:21 -07:00
Jeff Davis
f7ed8f6c9e Minor edits to readme.md to move build status graphic up higher on page 2013-06-08 21:10:38 -07:00
Jeff Davis
f49f7c4cb4 Update README.md 2013-06-08 22:00:01 -06:00
Jeff Davis
d876bfd14e Update README.md 2013-06-08 21:55:32 -06:00
Jeff Davis
32e9a161ba Update README.md 2013-06-08 21:55:10 -06:00
Jeff Davis
5a9ead35cb Merge pull request #100 from kruland2607/locpresets 
Added presets for LocPrecision contributed by Doug.
 2013-06-08 19:58:52 -07:00
Jeff Davis
2adfcd27a0 Merge pull request #99 from kruland2607/motorselectorbug 
The motors in the motor selector are not sorted by default.
 2013-06-08 19:47:06 -07:00
Jeff Davis
b02323099a Merge pull request #102 from soupwizard/master 
New test for .ork file versions, fixed failing unittest, ignored one failing unittest
 2013-06-08 19:28:27 -07:00
soupwizard
df85d0ee53 Added unittests saving and loading rockets to/from tmp in various file versions. 
Added @Ignore  and FIXME to failing LogLevelBufferLoggerTest
Fixed failing unitest IntegrationTest.java
Added test rockets for the various file versions of .ork
Changed TestMutex.java to write  messages to log saying that certain exceptions
that appear in log during unittests are ok because the test can't catch them.
 2013-06-08 19:09:36 -07:00
soupwizard
98635d7c9b Merge remote-tracking branch 'upstream/master' 2013-06-08 18:15:16 -07:00
Jeff Davis
911ad653fa Merge pull request #101 from dneelyep/openrocket-dev 
Added a dialog box warning when users try to run a simulation with no simulations selected.
 2013-06-08 17:23:09 -07:00
Daniel
6299898da7 Reverted a commit that is specific to my project. 2013-06-08 12:42:06 -04:00
Daniel
cd255e1828 Added a dialog box that displays when no simulations are selected. 2013-06-08 12:34:47 -04:00