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

517 Commits

Author SHA1 Message Date
kruland2607
c9c75248cf Added extra help message about configuring the default editor in 
preferences.
 2013-04-08 16:47:59 -05:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -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
7db0c17c56 Added some localized messages when exporting and editing decals. 2013-03-26 22:24:21 -05:00
kruland2607
b034eccd43 Corrected FIXME for localization. 2013-03-26 16:10:26 -05:00
Sampo Niskanen
525869c3e7 Refactoring or rocket configuration description 2013-03-22 18:12:58 +02:00
Sampo Niskanen
83fcf0894e Merge branch 'kruland-integration' of github.com:plaa/openrocket into kruland-integration-ui 2013-03-17 11:13:50 +02:00
Sampo Niskanen
b2776f5e92 UI refactoring 2013-03-17 11:13:32 +02:00
kruland2607
e8b9efd1d0 Merge remote-tracking branch 'upstream/kruland-integration-ui' into 
kruland-integration

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
 2013-03-16 18:35:31 -05:00
kruland2607
3eb96ee04d Merge branch 'tumble-recovery' into kruland-integration 
Conflicts:
	core/resources/datafiles/examples/Three-stage rocket.ork
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

Ignored changes to Three-stage rocket.ork since that will need to be
reproduced after the cool 3d view enhancements to the example.

The BasicEventSimulationEngine conflicts were trivial and manually
resolved.
 2013-03-13 14:34:11 -05:00
Sampo Niskanen
170ce13c05 Data model refactoring 2013-03-01 08:41:47 +02:00
Sampo Niskanen
4c48ec48c9 Merge branch 'kruland-integration' of github.com:plaa/openrocket into 
kruland-integration-ui

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java
 2013-02-23 08:51:22 +02:00
Sampo Niskanen
0e2ee6a566 Refactoring data model 2013-02-23 08:47:21 +02:00
kruland2607
f7def169ef Updated translation files from Boris du Reau. 2013-02-14 13:17:48 -06:00
kruland2607
b16917995d Change mouse button handling in simulation plot. Left click drag zooms 
area, and ctrl left click drag pans.
 2013-02-05 10:04:49 -06:00
Sampo Niskanen
d2035ce702 UI updates 2013-02-02 12:07:07 +02:00
Sampo Niskanen
b3b2303f27 Enhance flight configuration UI 2013-01-27 22:36:21 +02:00
bkuker
c1c4f99992 Trying out an "Unfinished" view... Jury is out 2013-01-10 15:36:08 -05:00
bkuker
c6bdd1ab78 Fix the clamp message 2013-01-07 16:22:48 -05:00
bkuker
e8ac5d4dea Add a sticker decal option 2013-01-03 15:24:23 -05: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
86d07ca8b8 I10n for color label 2012-12-17 16:18:49 -05:00
kruland2607
e516f99a8f Removed the "include decals" storage option - they will always be 
included when saving as ork file.  Fixed saving rocksim files - they are
just plain files and have no references to decals.
 2012-12-16 21:25:23 -06:00
kruland2607
7db51b9b65 Always save using .zip container format. Removed the "use compression" 
option from the StorageOptionChooser.
 2012-12-16 13:45:49 -06:00
kruland2607
db45a48e08 Localized the Export Decal menu item. 2012-12-12 21:39:07 -06:00
kruland2607
e5ed9e166b Added localized strings for the dialog. Removed FIXME saying "add 
buttons" because there are buttons.
 2012-12-12 16:48:36 -06:00
kruland2607
b99a704eb6 Added simulation of tumble recovery. Has pretty major FIXME which needs 
addressing.
 2012-12-11 21:28:12 -06:00
kruland2607
4de4d0d728 Usability enhancements to the simulation plot. 
- Made mouse wheel zoom.  alt mouse wheel zooms only domain.
- added explicit zoom buttons.  alt button zooms domain only.
- mouse drag pans the plot.
- use simulation name for window name & plot title.
 2012-11-06 20:56:42 -06:00
kruland2607
4179b0d6e6 Fix localization, dialog placement, and prepopulated fields in flight 
config dialogs.
 2012-10-26 11:58:41 -05:00
kruland2607
87e968690b Change labels and add explicit Edit buttons to all places where the 
flight configuration list is presented.
 2012-10-25 20:17:46 -05:00
batwings
564010974b Merge branch 'feature-rocketconfig' into integration 
Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
 2012-10-24 16:48:19 -05:00
batwings
b32be42092 Added full support for per flight-config stage separation: simulation, 
ork file, and gui configuration.
 2012-10-24 16:32:38 -05:00
batwings
5d65b591e1 Merge branch 'feature-rocketconfig' into integration 
Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
 2012-10-24 09:26:29 -05:00
kruland2607
5deae1d3db Found the missing pieces to make decals work. 2012-10-23 22:13:22 -05:00
kruland2607
04ee758e6a Fix up failures from the previous merges. 2012-10-23 21:56:35 -05:00
Kevin Ruland
fddf6cc0c7 Modified the AppearancePanel decal selector to have a combo box which follows the ComponentPreset pattern. The first entry in the combo box contains "none" entry which clears the decal associated with the component. The last entry in the combo box is "choose from file" which opens a file picker to select an image from the file system. The entries in between contain all the decals currently used by components in the document which facilitates reusing decals on the model. 2012-10-23 16:24:58 -05:00
Kevin Ruland
05d1b91d90 Sizable commit with lots of changes to support decals in openrocket files. Added support for zip container support. Changed Decal to hold a String instead of URL. Refactored GeneralRocketLoader out of the RocketLoader hierarchy so the GeneralRocketLoader knows about files and RocketLoader only knows about streams. Changed the OpenRocket file format to 1.6 and added <appearance> and it's children for ambient light and decals. Implemented a DecalRegistry which is a member of the OpenRocketDocument. This class is used to get InputStreams for decals by their names. 2012-10-23 15:54:45 -05:00
Bill Kuker
4ab28bbf54 Make the default checkbox text work the right way: check box's text, not a separate label 2012-10-23 15:12:35 -05:00
Bill Kuker
6a2ebb6851 Add translatable text names to the texture wrap mode enum 2012-10-23 15:12:28 -05:00
Bill Kuker
dc66d2a93e English l10n on appearance config 2012-10-23 14:53:38 -05:00
kruland2607
25f619aa19 Added button and dialog to select the ignition for a given motor. 2012-10-19 14:34:44 -05:00
kruland2607
3a8d2d5560 Implemented a DeploymentConfiguration object which includes the values 
used to determine the deployment of a recovery device.  The DeployEvent
enum was moved into this class.  Added a map of configuration id strings
to DeploymentConfiguration objects in the RecoveryDevice.  Modified
various setter/getters in RecoveryDevice to support a "default"
configuration defined in the device's configuration dialog.  Modified
BasicSimulationEngine to use the DeploymentConfiguration based on the
selected configuration.

Added to the FlightConfiguration dialogs to support editing these
configuration.

Missing are serialization of the map in ork files.
 2012-10-16 22:13:37 -05:00
kruland2607
e18b081273 Added some l10n strings to the motor table. Tightened up access to 
package scope member variables.
 2012-10-16 12:53:37 -05:00
kruland2607
d00dc2ff34 Added more buttons to configuration including broken copy button. Added 
tab layout to pane.  Added ignition spec to motor config table but
haven't hooked it up.
 2012-10-16 11:04:01 -05:00
kruland
a9a1860f96 Committing Russian l10n changes provided by Ruslan Uss. 2012-09-30 20:12:37 -05:00
Bill Kuker
3b368ac270 Reverting efforts to detect & reduce 3d crashes. 
Reverting:
1073
1074
1075
1076

1078
1079
 2012-09-28 20:25:31 +00:00
Sampo Niskanen
bfe48265e6 Add usage instructions to preset dialog 2012-09-27 16:36:45 +00:00