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

4240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
eb5321e82c Add script editor highlighting using RSyntaxTextArea 2014-12-27 20:20:32 +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
Craig Earls
1f84c89006 Adjusted alignment of time step controls. 2014-12-26 10:33:56 -08: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
kruland2607
3df7250d71 Merge pull request #224 from enderw88/recovery-device-deployment-speed-warning 
Took care of a LOW TODO about custom recovery speed warning.
 2014-12-26 09:17:44 -06:00
Craig Earls
7d95a36907 Moved wind direction below wind turbulence intensity. 2014-12-25 23:09:23 -08: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
ff2f68962c Finished simulation preferences panel. 2014-12-24 17:23:32 -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
kruland2607
eae24f68a9 Merge pull request #215 from enderw88/Configure-wind-direction 
Added configurable wind direction
 2014-12-23 15:43:52 -06: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
45ba0e3bb0 Added additional panel for color defaults 2014-12-22 19:39:17 -08: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
kruland2607
eaa6c32918 Merge pull request #216 from enderw88/Configure-design-window-font-size 
RocketInfo font size now configurable in options.
 2014-12-21 15:39:32 -06:00
kruland2607
a0d5bb01b9 Merge pull request #217 from enderw88/Change-Startup-OpenRocket 
Really fix Mac menu name issue.
 2014-12-21 15:38:24 -06:00
Craig Earls
4ed373b07a Changed startup class to OpenRocket 2014-12-21 11:51:18 -07:00
Craig Earls
cf7daba134 This is a simple change to help out the Mac Crowd. It just changes the name of Startup to OpenRocket so the the menu bar says OpenRocket instead of Startup. 
This gets around the very fragile OS X setup thing we have trying and failing at with the mac java client
 2014-12-21 10:55:10 -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