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

1451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
f300c3a6be Merge pull request #147 from kruland2607/master 
Added some logging and an additional mechanism to try to find the jar file URL.
 2013-09-26 09:25:52 -07:00
kruland2607
d00e70c0a9 Added some logging and an additional mechanism to try to find the jar 
file URL.
 2013-09-26 11:08:13 -05:00
Bill Kuker
0a4ca9fe54 Merge pull request #146 from bkuker/bugfix-osx-java7 
GL Preferences for compatibility - specifically with Java 7 on OSX.
 2013-09-26 08:23:58 -07:00
bkuker
6ba311d7ed Reference the correct jogl sourcepath 2013-09-24 17:00:43 -04:00
bkuker
de2e2e6bd5 I10n for the GL preferences 2013-09-24 16:59:59 -04:00
bkuker
321761cf0f Wire in prefs dialog to Preferences and RocketFigure3d 2013-09-24 13:12:14 -04:00
bkuker
d16d1c4a13 Add a mocked out GL preferences tab 2013-09-24 12:57:49 -04:00
kruland2607
d9a32556dc Merge pull request #145 from kruland2607/master 
Added C3 and D2 thrustcurves and fixed the Loki J175.
 2013-09-24 09:11:41 -07: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
bkuker
a4c0b3bb56 Clean up calls to invoke / display. 
I misread the JOGL javadoc and thought that these methods did not come
from a common superclass, for some reason they are listed under class
methods, not inherited methods.
 2013-09-24 09:14:48 -04:00
bkuker
1db67037b1 Correct jogl sources p2 2013-09-23 19:46:54 -04:00
bkuker
b2b05ce0b3 Choose between panel and canvas with hardcoded boolean 2013-09-23 19:46:53 -04:00
bkuker
2f39fab80c Correct version of sources for JOGL 2013-09-23 19:46:52 -04:00
bkuker
e9e98e3634 Work with GLCanvas or GLJPanel. Picking broken with Panel 2013-09-23 19:46:51 -04:00
bkuker
9c607dfb03 Improve pick()'s debuggability 
Let you call it with a null point without dying.
Trace out the picked color.
 2013-09-23 19:46:51 -04:00
bkuker
a3c44f220b Texparameters need to be set while texture is bound. 
This was causing the GLSL Fast-flip code in GLJPanel to die, I think it
was trying to mipmap the FBO.
 2013-09-23 19:46:50 -04:00
kruland2607
7d289b3daa Merge pull request #144 from kruland2607/master 
Fix for Issue #143.  Null pointer in warnings dialog when there is no simulation data.
 2013-09-23 08:35:59 -07:00
kruland2607
ac6623aa32 Fix for Issue #143. Null pointer in warnings dialog when there is no 
simulation data.
 2013-09-23 10:18:49 -05:00
kruland2607
1931a6f11e Merge pull request #142 from kruland2607/master 
Added more protection around getDesktop calls.  First test Desktop.isDesktopSupported() and fail fast.
 2013-09-16 08:27:51 -07:00
kruland2607
4421b0ef85 Added more protection around getDesktop calls. First test 
Desktop.isDesktopSupported() and fail fast.
 2013-09-16 10:04:19 -05:00
kruland2607
12b2f5e72c Merge pull request #141 from kruland2607/master 
Fix the "Simulate & Plot" button in the Simulation Dialog when multiple simulations are selected.
 2013-09-13 17:38:51 -07:00
kruland2607
ee38ef2d3d Fix the "Simulate & Plot" button in the Simulation Dialog when multiple 
simulations are selected.  In this case, it now says "Simulate" and the
dialog closes when finished.
 2013-09-13 19:37:58 -05:00
kruland2607
c3a7b80a3e Merge pull request #139 from kruland2607/master 
Updated russian translations.
 2013-09-09 20:06:57 -07:00
kruland2607
790c618101 Updated russian translations. 2013-09-09 22:06:44 -05:00
kruland2607
e8dad716b3 Seems one of my merges blew away the SimExpPan.border.Stage. 2013-09-08 20:29:25 -05:00
kruland2607
d61d4f7f2b Merge pull request #138 from kruland2607/master 
Seems one of my merges blew away the SimExpPan.border.Stage.
 2013-09-08 18:28:20 -07:00
Sampo Niskanen
6aa55a2c23 Update release instructions 2013-09-08 22:54:41 +03:00
Sampo Niskanen
e8ebb916d2 Update version to 'dev' 2013-09-08 22:47:01 +03:00
Sampo Niskanen
f59c8012fb Release 13.09 release-13.09 2013-09-08 22:22:03 +03:00
Sampo Niskanen
10dbc856ee Remove unnecessary FIXMEs 2013-09-08 22:20:38 +03:00
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