330 Commits

Author SHA1 Message Date
plaa
0ef470b02e Merge pull request #24 from rdgraham/openrocket-rdg
Openrocket rdg
2012-12-19 21:16:34 -08:00
soupwizard
f667bb4bf5 Added config file needed for travis-ci continuous integration hosting support. Fixed places in build.xml that had hardcoded path references to use relative references. Undid fix to build warning in MotorCompare.java, since the fix didn't work with java 1.7. 2012-12-16 23:26:04 -08:00
richard
df9ef0b984 Removed custom expression debug message 2012-12-16 23:07:44 -08:00
richard
661e391654 Merge branch 'master' of https://github.com/plaa/openrocket.git 2012-12-16 23:04:01 -08:00
richard
a7e73f6485 Fix bug with custom expressions where old sub expressions remained in an
expression after it was changed.

Fix bug to allow flight variables to be used inside index expressions.
2012-12-16 22:58:02 -08:00
soupwizard
11c247135e fixed ~150 build warnings 2012-12-16 00:12:44 -08:00
soupwizard
141decb4d3 fix about 100 build warnings by add @Override, a couple other warning fixes 2012-12-13 19:02:13 -08:00
soupwizard
dd0a9a12d9 removed unnecessary @SupressWarnings, to fix some build warnings 2012-12-11 18:15:42 -08:00
Sampo Niskanen
49858f589f Update thrust curve files 2012-12-10 23:30:56 +02:00
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +02:00
Sampo Niskanen
cffb77530e Merge branch 'master' of ssh://git@github.com/plaa/openrocket.git 2012-12-10 22:08:32 +02:00
Sampo Niskanen
42b4eeac31 Merge branch 'feature-improvepresetloading' of
github.com:kruland2607/openrocket

Conflicts:
	core/build.xml
	
Optimize motor loading further
2012-12-06 12:49:00 +02:00
kruland2607
89ff50d60c Fix whitespace and add SuppressWarnings. 2012-10-28 16:26:50 -05:00
kruland2607
bd66cc9338 Use Serializable representation of system supplied motors in jar file.
this greatly improves startup performance.
2012-10-28 11:26:40 -05:00
bkuker
0569ca17bf Replace stencil buffer with z-buffer to draw outline of selected items 2012-10-24 13:34:34 -04:00
Sampo Niskanen
8c49d33731 Add Guice injector to Application 2012-10-23 07:32:20 +03:00
Sampo Niskanen
d63dc601c0 Clean up application startup 2012-10-18 08:09:42 +03:00
Sampo Niskanen
730f7b2697 Fix JRE class loader 2012-10-18 07:58:04 +03:00
Sampo Niskanen
811292286e Make ClassBasedTranslator compatible with Guice 2012-10-15 07:33:24 +03:00
Sampo Niskanen
4670a010be Startup system using Guice and plugin loading 2012-10-14 17:51:10 +03:00
Sampo Niskanen
5622b4a2b5 Guice module for loading plugins 2012-10-10 22:12:34 +03:00
kruland2607
7f6c542e5d Try to use Java Serializable to improve loading of included
ComponentPresets.
2012-10-09 09:07:18 -05:00
kruland2607
d305f9a952 Cleaned up imports. 2012-10-07 22:24:33 -05:00
kruland2607
d8edf41355 Ignore simulation time steps <= 0 when loading ork file. 2012-10-07 22:19:59 -05:00
kruland2607
372bcae9a7 If the user selected a really small (0) timestep, the simulation gets
into an infinite loop.  Don't use a user selected timestep smaller than
MIN_TIME_STEP.
2012-10-07 22:19:27 -05:00
kruland2607
4d77c817d8 Merged changes fixing NaN when computing fin CG. 2012-10-07 22:18:53 -05:00
Bill Kuker
3b368ac270 Reverting efforts to detect & reduce 3d crashes.
Reverting:
1073
1074
1075
1076

1078
1079
2012-09-28 20:25:31 +00:00
Sampo Niskanen
506dc0c9b7 Unit rounding fine-tuning 2012-09-28 19:42:11 +00:00
Bill Kuker
2c6c5aa4c3 Move 3d initialization back where it was (left crash detection). Feeling was that dismissing the splash screen so early in linux felt like a crash. 2012-09-28 12:48:13 +00:00
Bill Kuker
1733ae5398 Add thread names to the danger-timer thread 2012-09-27 16:38:15 +00:00
Sampo Niskanen
bfe48265e6 Add usage instructions to preset dialog 2012-09-27 16:36:45 +00:00
Bill Kuker
22ee569d32 Add a timed check for GL Crash. Really a last resort. 2012-09-27 16:23:00 +00:00
Bill Kuker
b82be4fc02 Give a string description to each place I enter or leave the GL DangerZone 2012-09-27 16:15:45 +00:00
Bill Kuker
02360f89dd GL Init must happen after OSX init, or else the application name does not take effect. Ugh. 2012-09-27 14:55:24 +00:00
Bill Kuker
4073246388 Add a 3D enabled user preference
Add 3d Crash detection that disables 3d if the application crashes during one of several touchy phases of JOGL / Native / display driver initialization.
Always make the 3D view button clickable, but there is an explanation and a button to turn 3d on if it has been disabled
2012-09-27 14:44:04 +00:00
Doug Pedrick
2aa4a8d905 working directory changes. 2012-09-26 23:33:00 +00:00
Doug Pedrick
93bfce7f70 Uncommented component preset editor menu item, but protected it with a system property: -Dopenrocket.preseteditor.menu if present, the editor will be on the menu. 2012-09-26 18:09:12 +00:00
Doug Pedrick
391d02dc66 Changes to support integrated into main application. 2012-09-26 17:24:11 +00:00
Sampo Niskanen
efb4952333 Fix crash at startup due to splash screen handling 2012-09-26 14:51:28 +00:00
Kevin Ruland
a28c99fc54 Wired in the ComponentPresetEditor into the Edit menu. It is currently disabled because of some bugs in the ComponentPresetEditor. 2012-09-26 14:45:55 +00:00
Kevin Ruland
d5d0c7f8b8 Allow yet more time for loading presets. A bug report from a really slow machine took more than 2 minutes to parse all the files. 2012-09-26 13:50:39 +00:00
Kevin Ruland
ee31d47d1d Clear out references to the handler before putting the XMLReader back in the cache. This is to promote garbage collection. 2012-09-25 16:53:53 +00:00
Kevin Ruland
6ad5458da9 Ensure that whenever DoubleModel.getSpinnerModel() is used in a JSpinner, we explicitly set the spinner editor to our own SpinnerEditor instance. The makes the text field in the spinner editable. 2012-09-25 16:37:57 +00:00
Sampo Niskanen
1fb1e7e512 Fix+enhance motor configuration edit dialog 2012-09-25 13:03:11 +00:00
Sampo Niskanen
0725b54061 Fix spinner editor in custom material dialog 2012-09-25 11:53:08 +00:00
Doug Pedrick
d48a2cb400 Cleanup configuration as component change listener. 2012-09-25 03:24:22 +00:00
Doug Pedrick
9ce96bdc05 Fix to recursion bug. 2012-09-24 16:18:27 +00:00
Kevin Ruland
9c1a6c3e1c Use the hideDialog() static method to close the dialog, this prevents NPE as reported in a bug report. 2012-09-24 01:33:39 +00:00
Doug Pedrick
5b6e1ecf39 Added preference to auto-open last design file on startup. 2012-09-23 22:28:39 +00:00
Kevin Ruland
f74d784f89 Support loading orc component files from the filesystem located in the "user application directory"/Components 2012-09-21 21:01:59 +00:00