1448 Commits

Author SHA1 Message Date
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
e1cce52e3d Merge pull request #230 from kruland2607/feature-tubefins
Feature tubefins
2015-03-23 03:11:06 -05:00
kruland2607
37225b04e2 Merge remote-tracking branch 'upstream/master' into feature-tubefins 2015-03-22 21:06:57 -05:00
Sampo Niskanen
13b2a37785 Remove debugging code 2015-01-27 23:01:10 +02:00
Daniel_M_Williams
b75d7e38c6 when using 'File > Save As..' dialog, this patch will update the filename extension directly within the dialog box, upon chanig the FileFilter type, in addition to after the dialog is accepted. 2015-01-20 13:39:26 -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
45c41537ed Check that scripting engine supports Invocable before casting 2015-01-10 18:38:47 +02:00
Sampo Niskanen
8c00dbf159 Add unit tests for file version 1.7 (simulation extensions) 2015-01-10 18:36:24 +02:00
Sampo Niskanen
a6c2092379 Move TestScriptingUtil to test/ directory 2015-01-10 17:50:11 +02:00
kruland2607
8f478f6eb7 Merge pull request #225 from enderw88/fin-fillets
Fin fillets
2015-01-09 21:37:00 -06:00
kruland2607
482f2b8462 Merge pull request #227 from kruland2607/upstreammaster
Start using Java 1.7.
2015-01-09 21:36:26 -06:00
kruland2607
9db83259dc Start using Java 1.7. 2015-01-09 21:33:16 -06:00
Sampo Niskanen
31570a7a3b Presume a release to be made in 15.01 2015-01-09 18:59:45 +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
c2f44f97f6 Update example design of simulation extensions 2015-01-07 17:59:43 +02:00
Sampo Niskanen
129217cf2b Add degrees/sec as a roll unit 2015-01-07 17:37:40 +02:00
Sampo Niskanen
0eef08ae41 Fine-tune UI 2015-01-07 17:37:14 +02:00
Sampo Niskanen
9c75e7ee75 Call simulation extensions when a ORK document is loaded 2015-01-07 17:36:57 +02:00
Sampo Niskanen
78d282f56f Add possibility to copy simulation extensions from other simulations 2015-01-07 17:13:41 +02:00
Sampo Niskanen
79fd36dc9f Fix document loading/saving 2015-01-06 20:45:10 +02:00
Sampo Niskanen
a1f6782195 Disable untrusted scripts on loading files 2015-01-06 19:25:13 +02:00
Craig Earls
b55eb11a6f Compute fillet cross section and mass. 2014-12-28 11:45:54 -08: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
Sampo Niskanen
78cdd77d78 Clean up and document the clone() method in SimulationListener 2014-12-27 10:51:13 +02:00
Sampo Niskanen
807450b407 Remove unused methods from SimulationListener 2014-12-27 10:41:09 +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
kruland2607
f0c5476a39 Merge pull request #220 from enderw88/better-tree-icons
Added component tree icons for the new mass types.
2014-12-26 10:59:18 -06:00
kruland2607
46aeeb1396 Merge pull request #222 from enderw88/remove-deprecated-RocketComponent-functions
Removed unused and deprecated deepIterators
2014-12-26 09:20:06 -06:00
Craig Earls
eb3f77df39 Took care of a LOW TODO about custom recovery speed warning. 2014-12-25 22:41:10 -08:00
Craig Earls
dcfb952393 Removed unused and deprecated deepIterators 2014-12-25 18:23:13 -08:00
Craig Earls
5c791eadad Added component tree icons for the new mass types. 2014-12-24 21:39:31 -08:00
Craig Earls
ba2590ee04 Removed display tab for now. Preference reorganization complete. 2014-12-24 18:07:13 -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
e6b5248a0c Boost file format version to 1.7 when saving simulation extensions 2014-12-24 00:16:14 +02:00
Sampo Niskanen
7aca75f053 Implement launch velocity into AirStart extension 2014-12-23 23:49:37 +02:00
Sampo Niskanen
00a7b7edc7 Fix copy-paste bug 2014-12-23 23:48:51 +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
0d829c1c6b Wind and Launch rod decoupled. Initial UI complete 2014-12-21 20:56:15 -07: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