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

367 Commits

Author SHA1 Message Date
Daniel_M_Williams
ea8066f63c Fixed GUI elements & function f/Boosters/Pods 
Model
  Refactored code from AxialStage, BoosterSet, PodSet => ComponentAssembly

GUI
  BoosterSet: Fixed bugs, allowed boosters and pods to be correctly located.
 2015-08-27 08:54:35 -04:00
Daniel_M_Williams
0c01123551 refactored Stages (Axial & Booster) now load correctly. 2015-08-25 22:38:13 -04:00
Daniel_M_Williams
c8a3d675d8 messy commit: refactored Stage => AxialStage, BoosterSet, PodSet 2015-08-25 09:57:23 -04:00
Daniel_M_Williams
2f42594acb fixed many display issues relating to refactoring of RocketComponent axialOffset code. 2015-07-21 14:16:13 -04:00
Daniel_M_Williams
6f4cba68ae refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints 2015-06-23 13:12:48 -04:00
Daniel_M_Williams
8e268a9a25 added gui and model elements for stage multiplicity 2015-06-22 16:10:13 -04:00
Daniel_M_Williams
c5d47cf806 implemented gui elements for controlling stage axial placement. + other Event refinements 2015-06-15 15:38:18 -04:00
Daniel_M_Williams
4f716b40af Updated GUI with axial stage position elements 2015-06-13 22:47:19 -04:00
Daniel_M_Williams
8371876718 ACTUAL bugfix commit: Stage Config dialog fixed. 2015-06-08 18:19:23 -04:00
Daniel_M_Williams
b8b1e6576e [GUI Options Implemented] Implemented GUI elements to change the position of external components. 
External Components are pods and parallel stages.  Slightly different UI options have been implemented for each.
 2015-06-03 15:48:13 -04:00
celeron533
1c42de5540 Update zh_CN translation 
Update zh_CN translation file
 2015-03-28 18:03:56 +08:00
kruland2607
37225b04e2 Merge remote-tracking branch 'upstream/master' into feature-tubefins 2015-03-22 21:06:57 -05:00
Sampo Niskanen
487da3a3fc Merge remote-tracking branch 'upstream/master' into feature/scripting 
Conflicts:
	swing/.settings/org.eclipse.jdt.core.prefs
 2015-01-10 18:44:55 +02:00
Sampo Niskanen
bf71296794 Merge remote-tracking branch 'upstream/master' into feature/scripting 
Conflicts:
	swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java
 2015-01-07 18:03:57 +02:00
Sampo Niskanen
0eef08ae41 Fine-tune UI 2015-01-07 17:37:14 +02:00
Sampo Niskanen
78d282f56f Add possibility to copy simulation extensions from other simulations 2015-01-07 17:13:41 +02:00
Sampo Niskanen
a1f6782195 Disable untrusted scripts on loading files 2015-01-06 19:25:13 +02:00
Craig Earls
bc28fc58c5 Fin fillet UI complete, radius and material are saved to file and reloaded. 2014-12-27 20:11:09 -08:00
Sampo Niskanen
a39a3fce15 Add support for multiple scripting languages 2014-12-27 23:50:54 +02:00
Sampo Niskanen
a2c0af3b7f Initial implementation of scripting extension 2014-12-27 19:18:53 +02:00
kruland2607
90480faa24 Merge pull request #219 from enderw88/set-color-defaults-in-options 
Rearrange preferences and add simulation and launch condition preferences
 2014-12-26 14:01:46 -06:00
Craig Earls
5c791eadad Added component tree icons for the new mass types. 2014-12-24 21:39:31 -08:00
Craig Earls
5cc403368e Split all panels, implement new launch preferences panel. 2014-12-24 15:43:12 -08:00
Craig Earls
f4fc41e506 Rearranged preferences tabs, added default custom Mach number, 2014-12-24 00:36:57 -08:00
Craig Earls
b8999349a9 Merge branch 'master' into set-color-defaults-in-options 2014-12-23 19:48:12 -08:00
Sampo Niskanen
7aca75f053 Implement launch velocity into AirStart extension 2014-12-23 23:49:37 +02:00
Sampo Niskanen
82af205e3e Merge remote-tracking branch 'upstream/master' into feature/simulationextensions 
Conflicts:
	core/src/net/sf/openrocket/simulation/SimulationStatus.java
 2014-12-23 21:01:48 +02:00
Craig Earls
b96277afa0 Launch rod is now 0 North and decoupled from wind direction. 2014-12-21 20:05:57 -07:00
Craig Earls
d07b2f6802 Merge branch 'master' into set-color-defaults-in-options 2014-12-21 19:02:58 -07:00
Craig Earls
5e9eca3715 Merge branch 'master' into Configure-wind-direction 2014-12-21 19:00:30 -07:00
kruland2607
ea07f91f5e Merge remote-tracking branch 'cearls/Auto-run-simulations' 
Conflicts:
	swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java

Manually resolved.
 2014-12-21 19:32:27 -06:00
Craig Earls
185f7f7528 Merge branch 'master' into set-color-defaults-in-options 2014-12-21 15:52:31 -07:00
Craig Earls
a6f00ccaba Merge branch 'master' into Configure-wind-direction 2014-12-21 15:34:39 -07:00
Craig Earls
4310cd4b51 RocketInfo font size now configurable in option. Small is 11, medium is 14, large is 17. 
Corrected spelling on PrefChoiseSelector name, will get the translation keys some other time.
Added LineMetrics.descent to the line height for laying out the text in RocketInfo.
 2014-12-21 10:11:06 -07:00
Craig Earls
6ce7f0c23a Added configurable wind direction in simulation options. 
- added Ground Track plot type
- changed parameter names to East-West/North-South from parallel to wind and lateral
 2014-12-20 20:55:15 -07:00
Craig Earls
c28824b147 Added blank colorOptionsPane in preferences 2014-12-19 18:19:20 -07:00
Craig Earls
137af4f85b Updated the checkbox text to be more clear. 2014-12-19 17:51:05 -07:00
Craig Earls
05242d4f81 Add option to disable flight parameter estimates in the design window. 
The plumbing was all there, but no one ever exposed the functionality to the users.
 2014-12-19 14:31:30 -07:00
Craig Earls
233117628d Added auto run simulations checkbox to preferences. 2014-12-19 06:54:43 -07:00
Craig Earls
ded4df8103 Fixed 3 issues kruland had with mass type. 
1.  Mass tooltip only displays totals for components that have children.
2.  setMassComponentType now fires NON_FUNCTIONAL change event.
3.  Label now reads "Mass Type" and default is "Unspecified".
 2014-12-15 20:34:14 -07:00
Craig Earls
27a372eca5 Now drawing most mass types. 2014-12-13 12:31:54 -07:00
Craig Earls
f7f3b737d4 Added MassComponentType enum to allow categorizing mass components 
This is only the data model. MassComponentType added as an Enum.  MassComponentConfig dialog updated to combobox to select.
 2014-12-12 23:32:22 -07:00
kruland2607
1dbff4a0dc Use unique localization strings in the TubeFinSet config windo. 2014-11-13 09:40:28 -06:00
kruland2607
4e766c73d1 Tube fin component, configuration, viewing, file io. 2014-11-05 19:26:48 -06:00
kruland2607
73fabd01dd Added ukranian translations. 2014-10-02 20:23:51 -05:00
celeron533
c9e4c6dd37 Update zh_CN translation & logo 2014-09-26 15:13:45 +10:00
kruland2607
b1e53e4e6b Removed the tumbling warning during coast to apogee. 2014-05-20 09:29:31 -05:00
kruland2607
bef5ff4f4a Merge remote-tracking branch 'upstream/master' into override-indicators 2014-04-24 09:46:10 -05:00
kruland2607
ae64f7a7f9 CG & Mass override indicators in component tree. 2014-04-23 21:22:43 -05:00
Sampo Niskanen
b6e3a57b47 Implement simulation extensions 
Squashed commit of the following:

commit 058f603c23accbcdbe9110645f19164da7d57c85
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Sat Apr 12 10:52:21 2014 +0300

    Implmenent simulation extensions

commit a1ca913c7d7793a9209a5f98235336270db6ce10
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Fri Apr 11 19:45:12 2014 +0300

    WIP

commit 916f0bc8961360c0906b413485ca4e3700033740
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Tue Apr 1 20:23:25 2014 +0300

    WIP
 2014-04-12 10:54:17 +03:00