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

1118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
plaa
02927d0f2d Merge pull request #28 from bkuker/master 
Capture JOGL debug information
 2012-12-26 11:55:58 -08: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
Bill Kuker
22c1d9938c Merge pull request #27 from bkuker/master 
Fix Classpath-Jars value in build.xml
 2012-12-24 14:24:35 -08: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
bkuker
56be31cfd2 Use anisotrophic texture filtering if available. 2012-12-24 10:24:45 -05:00
Sampo Niskanen
407052e89e File format introduced with 12.09 2012-12-23 22:24:30 +02:00
kruland2607
669c49caf2 Build with java 6. 2012-12-22 15:30:06 -06:00
kruland2607
e0b5386513 Make the thrustcurve series labels unique which is required in 
jfreechart 1.0.14.
 2012-12-22 14:05:02 -06:00
Sampo Niskanen
3e81033b04 Define Eclipse project settings to use Java 1.6 level 2012-12-22 21:20:52 +02:00
Sampo Niskanen
1c04713131 Merge branch 'kruland-integration' of ssh://github.com/plaa/openrocket into kruland-integration 2012-12-22 13:29:08 +02:00
Sampo Niskanen
b29853e416 Fix library references in build file 2012-12-22 13:28:37 +02:00
kruland2607
bd1e3ce83c Minor fixups and method renaming. 2012-12-21 22:16:13 -06:00
kruland2607
618dd63b5c Moved Rocksim saving condition to the top of save, since there is no 
need to do all the decal name manipulation if we don't save decals in
Rocksim files.
 2012-12-21 10:19:52 -06:00
kruland2607
079ef2ba13 Removed comments about possible caching, it really isn't necessary. 2012-12-21 10:05:03 -06: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
kruland2607
728de34d8b Fix build to use new jfreechart and jcommon jars. 2012-12-19 16:08:27 -06:00
kruland2607
54c160ad9c Merge pull request #20 from bkuker/kruland-integration-decal-ui 
Kruland integration decal ui
 2012-12-18 07:30:05 -08:00
bkuker
31c351c9d5 Remove concept of material default for component 2012-12-17 16:19:03 -05:00
bkuker
f4a85993e6 Disable color choice when you have a texture selected. 2012-12-17 16:19:00 -05:00
bkuker
787ef8e347 Clean out some comments 2012-12-17 16:18:57 -05:00
bkuker
d966973f7d Rename texture unit and use it for offset too 2012-12-17 16:18:54 -05:00
bkuker
97b2c4002c Smaller sliders 2012-12-17 16:18:52 -05:00
bkuker
86d07ca8b8 I10n for color label 2012-12-17 16:18:49 -05: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
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
kruland2607
e516f99a8f Removed the "include decals" storage option - they will always be 
included when saving as ork file.  Fixed saving rocksim files - they are
just plain files and have no references to decals.
 2012-12-16 21:25:23 -06:00
kruland2607
7db51b9b65 Always save using .zip container format. Removed the "use compression" 
option from the StorageOptionChooser.
 2012-12-16 13:45:49 -06: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
kruland2607
1bbef243ac Merge pull request #14 from bkuker/kruland-integration-decals 
Decal UI Simplification & Fixes
 2012-12-14 08:21:27 -08:00
bkuker
9d065c90e7 Cleanup Apocalypse example: 
Better decals
Non-weird flips
Moved some couplers that seemed off.
 2012-12-14 09:53:35 -05:00
bkuker
efb05a554c Add a slider model to the IntegerModel, add a spinner to shine parameter 2012-12-14 09:36:43 -05:00
bkuker
591b05d867 Set up ligiting for figure 2012-12-14 09:36:40 -05:00
bkuker
aac5fb9451 Fix bug where selection outline stayed visible after a component is 
deleted
 2012-12-14 09:36:37 -05:00
bkuker
ee95d6998a Create a simpler appearance builder for a simplified UI. 2012-12-14 09:36:34 -05:00
bkuker
5a8833738c Allow batching several changes before firing a changeEvent 2012-12-14 09:36:32 -05:00
bkuker
e97ae2f4b0 If an absolute file is missing try resolving it in the directory the 
file was loaded from
 2012-12-14 09:35:53 -05:00
soupwizard
141decb4d3 fix about 100 build warnings by add @Override, a couple other warning fixes 2012-12-13 19:02:13 -08:00
kruland2607
a780b8da93 Added some FIXMEs for consideration when saving files with decals. 2012-12-13 11:01:16 -06:00