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

142 Commits

Author SHA1 Message Date
Sampo Niskanen
5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket 
Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
 2012-12-11 08:38:59 +02:00
Sampo Niskanen
49858f589f Update thrust curve files 2012-12-10 23:30:56 +02:00
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +02:00
Sampo Niskanen
42b4eeac31 Merge branch 'feature-improvepresetloading' of 
github.com:kruland2607/openrocket

Conflicts:
	core/build.xml
	
Optimize motor loading further
 2012-12-06 12:49:00 +02:00
kruland2607
6a073af40b Reorder the zoom buttons. Added zoom reset icon and button. Fixed 
spacer in SimulationPlotDialog so close button is always properly
located.
 2012-11-14 21:14:39 -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
bd66cc9338 Use Serializable representation of system supplied motors in jar file. 
this greatly improves startup performance.
 2012-10-28 11:26:40 -05:00
kruland2607
4179b0d6e6 Fix localization, dialog placement, and prepopulated fields in flight 
config dialogs.
 2012-10-26 11:58:41 -05:00
kruland2607
eb20d0e72e Added descriptions, author and rocket names to new examples. 2012-10-26 11:57:36 -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
kruland2607
36558e60a2 Updated the Boosted Dart example to have two different stage 
separations.
 2012-10-24 22:29:10 -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
fc2fd2a011 Merge branch 'feature-stagerecovery' into integration 
Conflicts:
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
 2012-10-24 10:22:48 -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
e78f5b27f1 Added example file with decals. 2012-10-23 16:23:09 -05:00
Kevin Ruland
d0569e5759 Fixed loading decals from example file. Added FileInfo class which is used to describe data about the file - what the URL is to it and it's parent directory (if appropriate). The FileInfo class is pushed into the DecalRegistry to facilitate loading decals from the correct location. Added the Apocalypse with decals as an example file. 2012-10-23 16:13:35 -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
a5d87244a4 Implemented flight data branches for stage recovery. Updated jfreechart 
to 1.0.14 and jcommon to 1.0.17.  Added primitive support for plotting
all databranches.
 2012-10-23 10:57:00 -05:00
kruland2607
8588918452 Updated HPR Airstart example. 2012-10-19 16:01:11 -05:00
kruland2607
6d190095a7 Example HPR with airstarted cluster. 2012-10-19 14:44:51 -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
kruland2607
7f6c542e5d Try to use Java Serializable to improve loading of included 
ComponentPresets.
 2012-10-09 09:07:18 -05:00
kruland
a9a1860f96 Committing Russian l10n changes provided by Ruslan Uss. 2012-09-30 20:12:37 -05:00
Sampo Niskanen
e7ba712bea Version to 12.09.1dev 2012-09-28 21:51:44 +00:00
Sampo Niskanen
8fbbb00387 Release 12.09.1 2012-09-28 21:42:20 +00: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
Bill Kuker
4073246388 Add a 3D enabled user preference 
Add 3d Crash detection that disables 3d if the application crashes during one of several touchy phases of JOGL / Native / display driver initialization.
Always make the 3D view button clickable, but there is an explanation and a button to turn 3d on if it has been disabled
 2012-09-27 14:44:04 +00:00
Kevin Ruland
a28c99fc54 Wired in the ComponentPresetEditor into the Edit menu. It is currently disabled because of some bugs in the ComponentPresetEditor. 2012-09-26 14:45:55 +00:00
Doug Pedrick
5b6e1ecf39 Added preference to auto-open last design file on startup. 2012-09-23 22:28:39 +00:00
Sampo Niskanen
ba8621a792 Build version to 12.09dev 2012-09-16 18:16:03 +00:00
Sampo Niskanen
cf68f13590 Release 12.09 2012-09-16 14:29:59 +00:00
Kevin Ruland
1542b2ee08 More localization updates by Ruslan Uss. 2012-09-15 22:54:27 +00:00
Boris du Reau
0a2ddd9d6e updated french translations 2012-09-12 20:47:56 +00:00
Kevin Ruland
f5241b85cd Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II. 2012-09-12 02:33:21 +00:00
Kevin Ruland
3e92068515 Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II. 2012-09-12 02:30:46 +00:00
Kevin Ruland
89a83d54fc Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II. 2012-09-12 01:53:50 +00:00
Kevin Ruland
b0d03cc473 More updates to localization provided by Ruslan Uss. 2012-09-11 16:10:51 +00:00
Richard Graham
1828f9d2fb Added gravitational acceleration and propellant mass datatypes. 2012-09-05 05:14:10 +00:00
Kevin Ruland
265b588035 Updated 3FNC Using Presets example so it uses the presets currently deployed and does not issue a warning message. 2012-08-29 13:45:56 +00:00