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

1420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kruland2607
e254ff0e94 Make the appearance dialog work better when switching between default 
texture and custom.  Also ensure that default texture names do not
appear in the texture drop down.
 2013-03-29 00:18:40 -05:00
kruland2607
fe8cc22f6b Have Simulation.duplicateSimulation copy the configuration id as well. 2013-03-27 22:12:54 -05:00
kruland2607
ea3aeedf1b Make SimulationOptions.copyFrom prefer matches based on exact match of 
the configuration id.
 2013-03-27 22:12:09 -05:00
kruland2607
4cc3485fa0 Have Rocket.setFlightConfigurationName honor the DEFAULT_NAME. 2013-03-27 09:58:31 -05:00
kruland2607
161caceba0 Removed FlightConfigurationModelRemoveMe. 2013-03-27 09:30:49 -05:00
kruland2607
e7189bd415 Added localization to remove FIXME. 2013-03-27 09:28:49 -05:00
Sampo Niskanen
2db59086dd Merge branch 'kruland-integration-ui' into kruland-integration 
Conflicts:
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
 2013-03-27 08:48:17 +02:00
Sampo Niskanen
5b93c923f5 Flight configuration dialogs 2013-03-27 07:55:42 +02:00
kruland2607
8bd5098b73 Added default/override buttons to SeparationSelectionDialog. In 
SeparationSelectionDialog, IgnitionSelectionDialog, and
DeploymentSelectionDialog, added code which selects the default or
override radio buttons based on if the the configuration already
overrides the parameters.
 2013-03-27 00:28:27 -05:00
kruland2607
4362896139 Fixed the deployment of the booster chute and named the recovery 
devices.
 2013-03-27 00:24:57 -05:00
kruland2607
96cba8ed02 Removed FIXME comment since the localization issue was resolved in 
previous commit.
 2013-03-26 22:26:25 -05:00
kruland2607
7db0c17c56 Added some localized messages when exporting and editing decals. 2013-03-26 22:24:21 -05:00
kruland2607
9bf9e55428 More fixes to displayed text when default has delay. 2013-03-26 17:44:23 -05:00
kruland2607
31241bc0b9 When the selected configuration changes, update all the panel contents. 2013-03-26 17:38:12 -05:00
kruland2607
5dbb723736 Update button states with every selection and corrected display of 
separation configuration.
 2013-03-26 17:37:31 -05:00
kruland2607
9916a98ccb Double clicking on ignition cell opens select ignition dialog. Removed 
FIXME.
 2013-03-26 17:20:00 -05:00
kruland2607
594638bf02 Removed the FIXME comment since it's not so important to change the 
names of the methods.
 2013-03-26 17:09:31 -05:00
kruland2607
56edaeff77 Corrected implementation of reset motor ignition to default. 2013-03-26 16:48:32 -05:00