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

220 Commits

Author SHA1 Message Date
kruland2607
f0ae25615e Rework simulation ui. Added support for default flight conditions. 
Editing of flight conditions on multiple simulations.  Changed
exceptions generated in simulation to still produce data.
 2013-05-23 11:01:21 -05:00
kruland2607
0d3e779488 Update PT translations. 2013-05-19 15:13:29 -05:00
kruland2607
7e2f0966e5 Updated Italian translations. 2013-05-13 21:49:01 -05:00
Sampo Niskanen
3f433c3b41 Change version number to 13.05dev 2013-05-04 21:27:45 +03:00
Sampo Niskanen
6b00c0a1e1 Version 13.05 2013-05-04 21:11:35 +03: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
Sampo Niskanen
6f2ee27eec Add space before/after footnote marker 2013-04-30 20:29:53 +03: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
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05:00
kruland2607
d2822b5fc6 Added two localization keys - appearance tab, and rocket panel, view 
type.
 2013-04-28 18:15:38 -05:00
kruland2607
0607823f63 Bump revision number. 2013-04-27 08:18:53 -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
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
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
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
8f9dc93705 Merge in l10n changes. 2013-04-16 13:53:17 -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
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
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
kruland2607
af7ef8360f Decorate the bottoms of all examples. 2013-03-29 00:22:18 -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
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
d6c4a0948d Updated database source files for presets and thrustcurves. 2013-03-13 23:31:50 -05:00
kruland2607
2cfd46760d Since it was decaled like a patriot, the dimensions were changed to more 
closely match a 1/2 scale rocket.
 2013-03-13 23:12:14 -05:00
kruland2607
c19a12b3b5 Rerun simulations on Three-stage rocket example so it the boosters use 
tumble recovery.
 2013-03-13 16:29:14 -05:00
Bill Kuker
db286c3293 Merge pull request #47 from bkuker/kruland-integration-examples 
Add some paint and decals to most of the examples.
 2013-03-13 13:48:18 -07:00
bkuker
4d9b691a39 Update all of the examples with some nice decals & paint. 2013-03-13 16:44:20 -04: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
15f39a1d24 Update example with data branches for all stages. 2013-02-05 15:15:22 -06:00
kruland2607
055daf6786 Change ork format for ignition and motor configurations. Make them 
different xml elements preparing for an alternative api allowing them to
be more independent.
 2013-02-05 14:26:41 -06:00