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

2338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupwizard
c17c4fa9b2 Revert "Create README.txt" 
This reverts commit 557073c0219e9c42f534e603bd3b7168d0b9d682.
 2013-04-23 13:40:04 -07:00
kruland2607
daf98cb810 Merge pull request #66 from kruland2607/master 
Fix for issue #60
 2013-04-22 14:08:52 -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
1b90acf496 Merge pull request #64 from kruland2607/master 
Fix various unit tests.
 2013-04-22 07:47:19 -07: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
soupwizard
c8c172ac87 Merge remote-tracking branch 'upstream/master' 2013-04-17 14:46:53 -07:00
soupwizard
0acc9595c8 Revert "fixed 4 bugs found by FindBugs plugin in Eclipse" 
This reverts commit 69130292f2edd7719f0b2dea9913796fa3d41461.
 2013-04-17 14:44:13 -07:00
kruland2607
90bc49a9fe Merge pull request #55 from plaa/kruland-integration 
Kruland integration
 2013-04-17 10:55:18 -07: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
kruland2607
8189da9de1 Added source packages to jogl and gluegen libraries. 2013-04-04 10:42:51 -05:00
kruland2607
d02bf71ce1 Added .gitignore which should have been part of the merge from master. 2013-04-04 10:41:25 -05:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -05:00
plaa
26cfe854f5 Merge pull request #49 from kruland2607/master 
Updated motor thrust curves and databases.
 2013-04-03 13:14:22 -07:00
plaa
d9a3f7ab13 Merge pull request #42 from kruland2607/l10n-updates 
Updated translation files from Boris du Reau.
 2013-04-03 13:13:17 -07:00
kruland2607
e25bb9b079 Updated apocalypse by moving motor tube to end of tail cone and adding 
rear centering right with appearance.  Added a motor and simulation.
 2013-04-01 15:16:45 -05:00
bkuker
b20076f248 Fix flash of paint without decals when switching between default and 
custom appearance
 2013-03-31 11:45:01 -04:00
Bill Kuker
f1ef2f39d0 Merge pull request #52 from bkuker/kruland-integration-transition-fix 
Fixes and improves 3d rendering of transitions
 2013-03-31 08:32:27 -07:00
bkuker
9fd739b4a8 Draw inside surface of transition offset by transition thickness. 
Note the offset is perpendicular to the axis of the rocket, not normal
to the transition surface, so it is not a perfect render, but closer to
correct than before.
 2013-03-30 10:37:55 -04:00
bkuker
c9652d851c Render edges of a transition with thickness 2013-03-30 09:39:51 -04:00
bkuker
4ff3b02916 Do not render shoulders if zero length 2013-03-30 09:19:14 -04:00
kruland2607
ec8248fd10 Implemented optimization for FlightConfigurableParameters. Added back 
support optimization of deployment delay, deployment altitude, and
ignition delay.  GeneralOptimizationDialog was changed to remove the
sorting or the optimization variables.  It was catestrophically broken
even after previous attempts to fix it.  Note: the change to
GeneralOptimizationDialog accidentally slipped into the previous commit.
 2013-03-29 00:39:49 -05:00
kruland2607
af7ef8360f Decorate the bottoms of all examples. 2013-03-29 00:22:18 -05:00