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

1236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bkuker
c7ffc442a5 Change "Shine" to a double in [0,1] 
Add shine to OR import & export
 2013-01-06 09:58:08 -05: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
plaa
e0738de2c0 Merge pull request #31 from bkuker/osx-undo 
Use platform default shortcut key in menus
 2013-01-04 14:49:13 -08:00
bkuker
a8e39af85d Use platform default shortcut key in menus 2013-01-03 19:31:13 -05:00
bkuker
5985dba36a Stickers Example 2013-01-03 15:24:43 -05:00
bkuker
e8bf775e56 Be more careful w/ my depth comparisons 2013-01-03 15:24:39 -05:00
bkuker
1a6c721add Render stickers 2013-01-03 15:24:35 -05:00
bkuker
143a032728 Further refactre RenderStrategies into RocketRenderer subclasses 2013-01-03 15:24:31 -05:00
bkuker
a857fb93be Moving from RenderStrategies to RocketRenderer subclasses. 2013-01-03 15:24:27 -05:00
bkuker
e8ac5d4dea Add a sticker decal option 2013-01-03 15:24:23 -05:00
bkuker
cbb78cf095 Simplified appearance. Is this really what we want? 2013-01-03 09:19:58 -05:00
plaa
e31f94ed99 Merge pull request #30 from rodinia814/printing 
Printing fixes; added Save As file to MRU
 2013-01-02 21:40:05 -08:00
kruland2607
98db1885c2 UI improvements for flight configurations. Ellipsize the ignition 
delay.  Change to using row selection instead of cell selection.  Change
the copy configuration to select the new configuration and copy the
name.
 2013-01-02 10:42:51 -06:00
Doug Pedrick
45b337b9f4 Printing fixes; added Save As file to MRU 2013-01-01 14:55:15 -06:00
plaa
583b1a78e6 Merge pull request #29 from bkuker/master 
Move System.err log capture to GuiceStartup
 2012-12-30 23:12:22 -08:00
kruland2607
177d40104e Add Edit Decal dialog available from Appearance tab. Added preference 
to control which editor is opened.
 2012-12-28 23:08:31 -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
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