884 Commits

Author SHA1 Message Date
Doug Pedrick
ffca820860 Initial file watcher code. 2012-12-19 20:22:14 -06:00
plaa
e7e6dc2dd5 Merge pull request #19 from soupwizard/master
Added support for Travis-CI hosted continuous integration to GitHub
2012-12-17 00:20:06 -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
plaa
dd6b417db2 Merge pull request #16 from soupwizard/fix-150-build-warnings
fixed ~180 build warnings
2012-12-16 08:54:14 -08:00
soupwizard
11c247135e fixed ~150 build warnings 2012-12-16 00:12:44 -08:00
plaa
58183fc2b6 Merge pull request #13 from soupwizard/fix-build-warnings-add-overrides
fix about 100 build warnings by add @Override, couple other warning fixes
2012-12-15 13:40:05 -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
plaa
be0fe5c0f7 Merge pull request #11 from soupwizard/remove-uneccesary-supress-warnings
removed unnecessary @SupressWarnings, to fix some build warnings
2012-12-11 20:38:20 -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
plaa
399fa4e0a7 Merge pull request #8 from bkuker/no-stencil
Replace stencil buffer with z-buffer to draw outline of selected items
2012-12-10 12:08:14 -08: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
e78a7fe027 Remove test jar 2012-10-14 17:51:38 +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
Sampo Niskanen
640cbc1179 Remove bin/ folders from reposiroty 2012-10-10 08:23:17 +03:00
kruland2607
7f6c542e5d Try to use Java Serializable to improve loading of included
ComponentPresets.
2012-10-09 09:07:18 -05:00
plaa
78e3931c9e Merge pull request #5 from kruland2607/bugfixes-1
Bugfixes 1
2012-10-08 11:58:50 -07:00
kruland2607
d305f9a952 Cleaned up imports. 2012-10-07 22:24:33 -05:00
kruland2607
ecac762940 Break up the area/cg test cases and add some documentation describing
what they are doing.
2012-10-07 22:20: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
kruland2607
9c3fce4517 Added couple of simple unit tests for computing area and cg for
Trapezoidal and Free Form FinSets.
2012-10-07 22:18:06 -05:00
plaa
52ce9a3409 Merge pull request #1 from kruland2607/master
Russian l10n changes.
2012-10-01 02:14:48 -07:00
kruland
a9a1860f96 Committing Russian l10n changes provided by Ruslan Uss. 2012-09-30 20:12:37 -05:00
Sampo Niskanen
a048a2b471 Convert svn:ignore properties to .gitignore. 2012-09-29 20:07:47 +03:00
Sampo Niskanen
e7ba712bea Version to 12.09.1dev 2012-09-28 21:51:44 +00:00
Sampo Niskanen
8fbbb00387 Release 12.09.1 release-12.09.1 2012-09-28 21:42:20 +00: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
313c9d24b9 ChangeLog updates. 2012-09-26 18:18:48 +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