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

1677 Commits

Author SHA1 Message Date
kruland2607
e6755e0e84 Rework the thrustcurve motor filter and information. They now share 
tabs on the MotorSelectionPanel.  Added Minimum Motor diameter to the
motor filter.
 2013-10-04 20:36:30 -05:00
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
5913fb2533 Merge branch '13.09dev' into feature-motorfilter 2013-10-02 20:48:47 -05:00
kruland2607
e44c87029b Fix eclipse classpath after moving the lib-test stuff. 2013-10-02 20:48:13 -05:00
kruland2607
24bba56059 Merge branch '13.09dev' into feature-motorfilter 2013-10-02 13:05:27 -05:00
kruland2607
fa7916f7b0 Localized column heading and added rocket listener to update columns. 2013-10-01 11:34:57 -05:00
kruland2607
43187b2b2c Implement Configuration tab in BasicFrame next to Design and Simulation tabs. Provides functionality to configure motors, recovery and stages. Todo - verify functionality, add listeners to the table contents change when the design is updated, add listener so the configuration is highlighed to reflect selection in RocketFigure. 2013-09-30 21:12:52 -05:00
kruland2607
d692288f68 Added build.xml driver in root directory. Moved a few files around to support 
unittest.
 2013-09-30 11:38:54 -05:00
kruland2607
572b14de13 Localize motor popup and new fields in ThrustCurveMotorSelectionPanel. 2013-09-28 22:16:31 -05:00
kruland2607
246b9a6823 Relocate the swing files into the swing/ project. They were misplaced with the rebase. 2013-09-27 21:54:05 -05:00
kruland2607
ea6aa3e414 Added manufacturer selection boxes and exclude motors currently used 
filters.
 2013-09-27 21:51:17 -05:00
kruland2607
84af78ccf4 Extract the MotorRowFilter out of the ThrustCurveMotorSelectionPanel to 
facilitate adding more filters.
 2013-09-27 21:51:10 -05:00
kruland2607
f3bcdfcfc2 Changed eclipse project name to OpenRocket Core. 2013-09-27 20:59:35 -05:00
kruland2607
26fb295554 Rework source structure to separate swing gui code from core code. 
Separate swing application code from core code.  Moved a bunch of sources
and libraries around.  Created new eclipse project.

Further refinements to make it build.

Update gitignore.
 2013-09-27 11:34:46 -05: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
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
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
4421b0ef85 Added more protection around getDesktop calls. First test 
Desktop.isDesktopSupported() and fail fast.
 2013-09-16 10:04:19 -05: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
7763af389e Added little l10n properties analysis tool, and fixed some obvious 
errors in cs & it localizations.
 2013-09-13 10:46:35 -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 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