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

1107 Commits

Author SHA1 Message Date
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
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05: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
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
0607823f63 Bump revision number. 2013-04-27 08:18:53 -05: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
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
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
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
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
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
kruland2607
1f109acf41 Fix PluginTest by creating the PluginModule as a child of the 
ApplicationModule.  Unfortunately, ApplicationModule requires a
preference provider to be set.
 2013-04-22 15:32:29 -05:00
kruland2607
173108c1a8 Allow setAppearance to accept a null Appearance parameter without 
throwing NPE.
 2013-04-22 09:23:45 -05:00
kruland2607
f899b9fb2e Fixed RocksimDocumentDTOTest by having RocksimTestBase extend 
BaseApplicationAbstractTest to create a more complete Application
object.
 2013-04-22 09:14:15 -05:00
kruland2607
2738f30489 Added BaseApplicationAbstractTest base class which will use Guice to 
create the application framework.  It is roughly equivalent to the first
step of bootstrapping with ApplicationModule.  Modified unit tests which
require a more complete application framework.
 2013-04-22 09:09:11 -05:00
kruland2607
c1ad923d93 Fix initialization in constructors so all constructors initialize the 
motorConfigurations and ignitionConfiguration.  This fixes unit tests.
 2013-04-21 21:45:13 -05:00
kruland2607
2bad65410d Ignore changes to ignition, stage separation, and motor configuration. 2013-04-21 21:42:32 -05:00
kruland2607
a6a8a94986 Updated ja & pt localization files for changed keys. Updated ChangeLog 
and fileformat files.
 2013-04-17 12:50:56 -05:00
kruland2607
50e37d747f Added footnotes for configurable parameters. 2013-04-16 21:54:45 -05:00
Sampo Niskanen
c55ad71fd5 Update copyright year 2013-04-16 22:55:01 +03:00
Sampo Niskanen
74d5ffdcb7 Update splashscreen copyright 2013-04-16 22:50:17 +03:00
kruland2607
701b8966a2 Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/resources/l10n/messages_fr.properties
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
 2013-04-16 14:28:42 -05:00
kruland2607
15c1cffde6 Display language names in the preference drop down in both the localized 
and unlocalized form.  This makes switching for non-native speakers
easier.
 2013-04-16 14:10:24 -05:00
kruland2607
8f9dc93705 Merge in l10n changes. 2013-04-16 13:53:17 -05:00
kruland2607
44e0274ab2 When importing from RockSim, ignore texture specs which are empty. 2013-04-14 18:39:06 -05:00
kruland2607
8d90c8aae4 When importing from RockSim, don't complain about spill holes in 
parachutes when the hole has radius 0.
 2013-04-14 18:44:29 -05:00
kruland2607
b157d31748 bump revision number to 12.04beta1 2013-04-14 16:45:39 -05:00
kruland2607
c9c75248cf Added extra help message about configuring the default editor in 
preferences.
 2013-04-08 16:47:59 -05:00
kruland2607
1d3d860864 Correct casts used in reset action on radial position tab. 2013-04-08 16:08:13 -05:00
kruland2607
abb2a7c22a Removed some printlns. 2013-04-08 16:07:16 -05:00
kruland2607
52772674d2 Fixed issue with 3d view now updating when an edited texture is saved. 
The Configuration object did not propagate the underlying Texture
Changed ComponentChangeEvent object.  Modified RocketPanel to listen to
the Rocket object for Texture changes, and to the Configuration object
for other changes which update the "extras" (cg, stability, etc) and the
Figure.
 2013-04-07 20:46:39 -05:00
kruland2607
faac6d2537 commented out extraneous println. 2013-04-07 20:46:38 -05:00
bkuker
0477c3edfd Fix for issue #45, set the appearance on the freeform finset when 
chaning a finset to freeform.
 2013-04-07 09:29:50 -04:00
bkuker
6f72662ea8 get motor from MotorMount with non-deprecated method 2013-04-05 14:17:35 -04:00
bkuker
d7b46d6058 Pretty confident I should be clearing textures on dispose() 2013-04-05 13:56:04 -04:00
bkuker
381cab468c Fix the order of init() calls to fix brightness problem on paint vs 
texture.
Clean up the setType method, but it is still not great.
 2013-04-05 13:55:48 -04:00
kruland2607
9b96dabb16 Dirty fix for problem switching to 3d rendering the first time. 2013-04-04 10:44:28 -05:00