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

350 Commits

Author SHA1 Message Date
kruland2607
512f572879 Merge pull request #259 from wcravens/mass-info-both-with-and-without-motor 
Mass info both with and without motor - Includes IntelliJ CE Configuration files
 2016-03-24 17:36:30 -05:00
Wes Cravens
74d636bf33 Add concurrent mass info for both with and without motor configuration 2016-03-23 13:23:40 -05:00
Kevin Ruland
4924773c3a Changed to using Import/Export file menu functions to handle RockSim 
formatted files.  Save & Save As will only save in ork format.
 2015-11-21 21:37:57 -06:00
Kevin Ruland
e8167ac159 Added message properties and prefs for showing warning dialogs. 
Restored auto-open last design preference.
 2015-10-28 06:27:55 -05:00
Harry Dalton
39ec03370d Adding missing Spanish translation` 
(thanks to Carlos)
 2015-10-08 12:14:12 +01:00
celeron533
1c42de5540 Update zh_CN translation 
Update zh_CN translation file
 2015-03-28 18:03:56 +08:00
kruland2607
25a2279073 Change to dev. 2015-03-26 08:01:05 -05:00
kruland2607
b15afb3709 Changing release version back to 15.03 to get the tag in the correct place. 2015-03-26 08:00:10 -05:00
kruland2607
a631f39483 Prepare for 15.03dev 2015-03-26 06:57:13 -05:00
kruland2607
f3440bac68 Merge branch 'master' of https://github.com/openrocket/openrocket 
Conflicts:
	core/fileformat.txt
 2015-03-26 06:52:22 -05:00
kruland2607
e6ba1e349c Updated documentation for 15.03. 2015-03-26 06:49:54 -05:00
kruland2607
13dc5289ff Updated thrustcurves. 2015-03-23 07:02:10 -05: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
279420dd46 Prepare for dev 2014-11-02 12:22:14 -06:00
kruland2607
a9ba6172a9 Update documentation for 14.11 release. 2014-11-02 12:11:49 -06:00
kruland2607
f8037614a4 Update thrustcurves. 2014-10-29 19:11:07 -05: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