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

1322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sampo Niskanen
3f433c3b41 Change version number to 13.05dev 2013-05-04 21:27:45 +03:00
Sampo Niskanen
763f8dd753 Change source repository to point to GitHub 2013-05-04 21:19:17 +03:00
Sampo Niskanen
6b00c0a1e1 Version 13.05 release-13.05 2013-05-04 21:11:35 +03:00
Sampo Niskanen
d5e981af7e Fix failing unit test 2013-05-04 21:11:03 +03:00
Sampo Niskanen
bb916d1889 Fix "ant dist" build script 2013-05-04 21:10:39 +03:00
kruland2607
ae317f5270 Merge pull request #93 from kruland2607/master 
Fixed Preset Usage.ork
 2013-05-03 10:05:25 -07:00
kruland2607
c00a451704 Update the preset usage example. It has lost it's presets because it 
had been edited with a developer version of OR quite some time ago when
presets were broken.
 2013-05-03 12:06:00 -05:00
kruland2607
2f0e636489 Merge pull request #92 from kruland2607/master 
synchronize the drop down with the file name in chooser.
 2013-05-02 07:36:46 -07:00
kruland2607
bf6de6db66 Update the file name in the chooser to match the selected decal name. 2013-05-02 09:35:50 -05:00
kruland2607
7567bbf5e9 Merge pull request #91 from kruland2607/master 
Save windspeed preference
 2013-05-01 12:39:16 -07:00
kruland2607
77b78c4cb8 Windspeed units wasn't being saved in the preferences. 2013-05-01 14:37:46 -05:00
Bill Kuker
871f30a942 Merge pull request #89 from bkuker/master-issue81 
Remove the fancy fin-edge rendering
 2013-04-30 14:15:58 -07:00
bkuker
3cad3405ff Remove the fancy fin-edge rendering, it can't deal with the real world 
well enough yet.
 2013-04-30 17:12:41 -04:00
Sampo Niskanen
6f2ee27eec Add space before/after footnote marker 2013-04-30 20:29:53 +03:00
kruland2607
fac58f8adf Merge pull request #87 from kruland2607/master 
Updated spanish file and bumping to beta3.
 2013-04-29 11:00:03 -07:00
kruland2607
3ab8616e0c Bump to beta3 2013-04-29 12:59:56 -05:00
kruland2607
41031a0936 Updated Spanish translations. 2013-04-29 12:59:29 -05:00
kruland2607
157074b139 Merge pull request #86 from kruland2607/master 
Updates to fr, en & ru localized strings.
 2013-04-29 08:40:32 -07:00
kruland2607
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05:00
kruland2607
844ac9bc08 Merge pull request #85 from soupwizard/master 
Fix github issue #84 "The CP & CG markers appear in the 2d rear view."
 2013-04-29 06:51:19 -07:00
soupwizard
8f4d626a9a fix github issue #84 "The CP & CG markers appear in the 2d rear view." 2013-04-28 20:50:49 -07:00
kruland2607
018aa36703 Merge pull request #83 from kruland2607/master 
Few changes from beta.
 2013-04-28 16:16:29 -07:00
kruland2607
d2822b5fc6 Added two localization keys - appearance tab, and rocket panel, view 
type.
 2013-04-28 18:15:38 -05:00
kruland2607
fee17f3878 Added release notes from changelog. 2013-04-27 21:23:16 -05:00
kruland2607
793c7dd3bb Prevent NPEs by disabling the Export menu item when no decals are on the 
model.  Also have the Edit button in AppearancePanel be enabled only by
the addition of an image on the AppearanceBuilder.
 2013-04-27 20:59:36 -05:00
kruland2607
d66fe57011 Merge pull request #80 from kruland2607/master 
bump to v2
 2013-04-27 06:23:55 -07:00
kruland2607
0607823f63 Bump revision number. 2013-04-27 08:18:53 -05:00
kruland2607
1d33f1db8c Merge pull request #78 from kruland2607/master 
Load presets in foreground thread.
 2013-04-26 19:31:27 -07:00
kruland2607
8baf9e6676 Load the components in the foreground thread so they are completely 
loaded before trying to read an ork file from the command line.
 2013-04-26 21:28:21 -05:00
kruland2607
3c8ffbf5b1 Merge pull request #76 from kruland2607/master 
Serialized preset database needs to translator and en locale.
 2013-04-25 19:52:58 -07:00
kruland2607
1e2c64b6f0 Fixed major problem with preset serialized database. They need to have 
a translator set correctly or else the material types will not match and
presets used in models will be cleared when the document is loaded.
 2013-04-25 21:51:43 -05:00
kruland2607
a91e1973e4 Merge pull request #75 from kruland2607/master 
Removed FIXME
 2013-04-25 11:59:19 -07:00
kruland2607
f0228aa878 Removed last FIXME after manually verifying all calls to the method. 2013-04-25 13:58:34 -05:00
kruland2607
3da320c24b Merge pull request #71 from soupwizard/master 
Update travis-ci config to run unit tests and show test results in ant output
 2013-04-25 10:51:48 -07:00
kruland2607
668a7c0722 Merge pull request #74 from kruland2607/master 
Fix for https://github.com/plaa/openrocket/issues/72
 2013-04-25 10:51:12 -07:00
soupwizard
dfd73c9a54 Revert "Modified application startup to set the base translator the same way the" 
This reverts commit 1ce951e635b8062864c94af73759034597bf8807.
 2013-04-25 10:21:52 -07:00
kruland2607
b5610b0926 Fix the expectations in the PresetTests to account for changes in the 
DebugTranslator for material names.
 2013-04-25 11:16:31 -05:00
Bill Kuker
b05e882cd5 Merge pull request #73 from bkuker/master-imagesrink 
Shrink images in examples and textures
 2013-04-25 05:39:29 -07:00
soupwizard
1ce951e635 Modified application startup to set the base translator the same way the 
guice startup does - if the locale is set to 'xx' then the base translator
is the debug translator, otherwise the base translator is ResourceBundleTranslator.
You can set the locale by passing '-Duser.language=xx' to the jvm when starting up.
This fixes github issue #17.
 2013-04-24 22:46:22 -07:00
soupwizard
1cfdbf7e3f Added a build target "unittest-no-junit-report" to run unit tests and 
not create a junit report, but instead to show test run results in
the ant output stream. Modified .travis.yml to use
unittest-no-junit-report instead of unittest, and to change directory
to core before doing the build and unittest.
 2013-04-24 20:03:12 -07:00
kruland2607
38cb932331 Merge pull request #70 from kruland2607/master 
Renamed base class in unit test framework.
 2013-04-24 12:18:50 -07:00
kruland2607
6caca93421 Renamed BaseApplicationAbstractTest to AbstractBaseApplication so it 
wouldn't get executed by the unittest target.
 2013-04-24 14:17:37 -05:00
bkuker
3e57b36ffb Reduce built-in image sizes 2013-04-24 15:06:34 -04:00
bkuker
a649695423 Smaller simple sample 2013-04-24 14:47:19 -04:00
bkuker
6d12d265ac Smaller Examples 2013-04-24 14:41:08 -04:00
kruland2607
3dec7ec154 Merge pull request #67 from soupwizard/master 
Update travis-ci config, fix non-ascii char in FinRenderer, Add new unit tests for Configuration.java.
 2013-04-24 07:11:09 -07:00
kruland2607
89552e9c6a Merge pull request #69 from kruland2607/master 
Fix for https://github.com/plaa/openrocket/issues/68
 2013-04-24 07:06:47 -07:00
kruland2607
8a31d358d4 Set Spill hole in rocksimTestRocket3.rkt to 1.0 so the loader will 
generate the warning.  I had changed generation of the SpillHole warning
to only be issued if the diameter is > 0.
 2013-04-24 09:04:58 -05:00
soupwizard
448d2e606c Update travis-ci config file run unittests. Add new unittest ConfigurationTest.java. Fix FinRenderer.java to not have non-ascii character in a comment. 2013-04-23 14:26:46 -07:00
soupwizard
bc282a0e6c Merge remote-tracking branch 'upstream/master' 2013-04-23 13:42:49 -07:00