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

486 Commits

Author SHA1 Message Date
bkuker
00a17eb0e2 Merge remote-tracking branch 'plaa/master' into latest-jogl 
Conflicts:
	core/.classpath
 2013-03-02 11:08:49 -05:00
Sampo Niskanen
18e58199e6 Merge branch 'master' of git@github.com:plaa/openrocket.git 2013-02-02 12:34:05 +02:00
Sampo Niskanen
be67cad964 Fix default units (issue #32) 2013-02-02 12:33:49 +02:00
bkuker
5f712a7b77 Merge remote-tracking branch 'plaa/master' into latest-jogl 2013-01-27 15:02:37 -05:00
bkuker
e7a7a5fbc9 JOGL 2.0-rc11 2013-01-27 15:01:15 -05:00
kruland2607
775b9d1d13 Fix bug with fin marking guide. If a rocket has some split fins 
asymetrically placed around the rocket, the fin marking lines might not
be drawn in the wrap.  I simplified the algorithm used so first we
determine what angle the split in the wrap is, then we position each
line relative to it.
 2013-01-26 22:29:11 -06:00
Sampo Niskanen
8c0c9bb10d Plugin system 2013-01-23 08:32:09 +02:00
Sampo Niskanen
4141b478f7 Fix designation sorting of various Cesaroni motors 2013-01-10 20:40:36 +02:00
Sampo Niskanen
ff83f2bad8 Project-specific code style formatting 2013-01-06 21:45:02 +02:00
Sampo Niskanen
011bcd27e2 Refactor convertStringToBytes method 2013-01-06 16:12:12 +02:00
plaa
e2e509210c Merge pull request #25 from rodinia814/watcher 
Directory/File Watcher
 2013-01-04 14:52:03 -08:00
bkuker
a8e39af85d Use platform default shortcut key in menus 2013-01-03 19:31:13 -05:00
Doug Pedrick
45b337b9f4 Printing fixes; added Save As file to MRU 2013-01-01 14:55:15 -06:00
bkuker
ff7e5d5d04 Move JOGL debug setup to GuiceStartup. 
Always capture System.err to log.
Also write captured System.err to STDERR if the log is NOT being written
to either STDERR or STDOUT (So it appears on the console one way or
another).
 2012-12-27 10:17:48 -05:00
bkuker
77374d3992 Try to quiet JOGL down a little by classifying indented lines as 
verbose, not debug.
 2012-12-26 14:01:30 -05:00
bkuker
003e6c35f1 if openrocket.debug then redirect stderr to log.debug(). 2012-12-26 13:56:24 -05:00
bkuker
bc2e759d86 Remove some overactive logging 2012-12-26 13:52:52 -05:00
bkuker
56c6d1b714 Include JOGL implementation version in bug report 2012-12-26 09:42:13 -05:00
bkuker
be9f6040ee Fix classpath jars 2012-12-24 15:33:34 -05:00
plaa
9bb4e12c77 Merge pull request #26 from bkuker/master 
Remove "Attempted firing event..." log statement
 2012-12-24 09:55:22 -08:00
bkuker
5a8fa640a2 Remove log statement about ignored event if component not part of rocket 2012-12-24 10:58:34 -05:00
Sampo Niskanen
407052e89e File format introduced with 12.09 2012-12-23 22:24:30 +02:00
Sampo Niskanen
3e81033b04 Define Eclipse project settings to use Java 1.6 level 2012-12-22 21:20:52 +02:00
plaa
0ef470b02e Merge pull request #24 from rdgraham/openrocket-rdg 
Openrocket rdg
 2012-12-19 21:16:34 -08:00
Doug Pedrick
ffca820860 Initial file watcher code. 2012-12-19 20:22:14 -06: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
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
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
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