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

1746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Craig Earls
137af4f85b Updated the checkbox text to be more clear. 2014-12-19 17:51:05 -07:00
Craig Earls
6110e0f5cd Outdated simulations will now run when the simulations tab is selected. 2014-12-19 17:47:29 -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
kruland2607
c85fe63ed8 Merge pull request #212 from enderw88/master 
Mass Object Symbols and Section mass in component tree tooltips.
 2014-12-17 06:47:22 -06: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
8d74ea9e6f Merge branch 'mass-object-categories' 2014-12-14 12:04:10 -07:00
Craig Earls
8a8bb51f48 Added Stream and Shock cord symbology. 2014-12-14 12:03:25 -07:00
Craig Earls
c741079fd6 Restructuring and adding symbols to all MassObjects. 2014-12-14 10:27:24 -07:00
Craig Earls
77cfa2bdf2 Sum up mass of subcomponent and put in component tree tooltip. 2014-12-13 16:45:49 -07:00
Craig Earls
f0609029e8 Clean up how symbol is added to themes component shape. Ready for release. 2014-12-13 15:41:36 -07:00
Craig Earls
07b831c34f Mass types now save. 2014-12-13 15:21:09 -07:00
Craig Earls
66eb5753e5 All mass types being drawn. 2014-12-13 13:49:48 -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
279420dd46 Prepare for dev 2014-11-02 12:22:14 -06:00
kruland2607
a9ba6172a9 Update documentation for 14.11 release. release-14.11 2014-11-02 12:11:49 -06:00
kruland2607
22c3aadc4a Merge pull request #210 from kruland2607/master 
Escape decal names in ork file
 2014-10-31 11:16:23 -05:00
kruland2607
09cb51d77a HTML escape the decal file name just in case it contains & or other 
illegal characters.
 2014-10-30 19:21:59 -05:00
kruland2607
e5bba400c1 Merge remote-tracking branch 'upstream/master' 2014-10-29 19:41:27 -05:00
kruland2607
cf9fc6680f Merge pull request #209 from kruland2607/master 
new thrustcurves and couple of bug fixes.
 2014-10-29 19:36:52 -05:00
kruland2607
0006f2c780 Update thrustcurves. 2014-10-29 19:12:33 -05:00
kruland2607
37d686adb3 Fix reported bug. The mass & cg override icons wouldn't appear 
immediate when a components mass was overridden.  The ComponentTreeModel
needs to update the tree on mass changes too.
 2014-10-29 19:12:30 -05:00
kruland2607
6fbbef1bb5 Fixed NPE reported through a bug report. Somehow the listenerList was 
null when a change event was fired.  Don't know how this really can
happen, but protecting against the NPE isn't a bad idea.
 2014-10-29 19:12:28 -05:00
kruland2607
78d0eaefbd Fix persistant bug report which is reproduced by undoing the addition of 
a flight configuration.  Need to test if the current selection in the
flight configuration table is off the table's current size.
 2014-10-29 19:12:26 -05:00
kruland2607
f8037614a4 Update thrustcurves. 2014-10-29 19:11:07 -05:00
kruland2607
1c48d69c8c Merge pull request #208 from teyrana/master 
[Fix] Fixed bug in RSE file loading ( XML-formatted engine description)
 2014-10-29 17:29:24 -05:00
Daniel_M_Williams
0752b97143 [Fix][Cont] Added Unit test for RSE-load negative mass bug. 
- Added Test case in TestMotorLoader.java
  - Added Test load file 'test3.rse' which would previously raise an IOException on load.
  - Added this test case to the 'testGeneralMotorLoader' method as well.
  - Adjusted the digest string so that 'test3.rse' will pass the unit tests.
  - TestMotorLoader currently passes 5/5 unit tests.
 2014-10-29 15:19:10 -06:00
Daniel_M_Williams
d905d24f47 re-apply patch 5c0d9eb... which was clobbered by mistake 2014-10-29 14:59:25 -06:00
Daniel_M_Williams
67e741a2df [Fix][Cont] Added Unit test for RSE-load negative mass bug. 
- Added Test case in TestMotorLoader.java
  - Added Test load file 'test3.rse' which would previously raise an IOException on load.
  - Added this test case to the 'testGeneralMotorLoader' method as well.
  - Adjusted the digest string so that 'test3.rse' will pass the unit tests.
  - TestMotorLoader currently passes 5/5 unit tests.
 2014-10-29 14:55:32 -06:00
kruland2607
c9f6305154 Fix reported bug. The mass & cg override icons wouldn't appear 
immediate when a components mass was overridden.  The ComponentTreeModel
needs to update the tree on mass changes too.
 2014-10-28 20:47:48 -05:00
kruland2607
756577400c Fixed NPE reported through a bug report. Somehow the listenerList was 
null when a change event was fired.  Don't know how this really can
happen, but protecting against the NPE isn't a bad idea.
 2014-10-28 20:34:47 -05:00
kruland2607
c639bd453f Fix persistant bug report which is reproduced by undoing the addition of 
a flight configuration.  Need to test if the current selection in the
flight configuration table is off the table's current size.
 2014-10-28 20:28:20 -05:00
Daniel_M_Williams
ab5d8f2a51 [Fix][Cont] Added Unit test for RSE-load negative mass bug. 
- Added Test case in TestMotorLoader.java
  - Added Test load file 'test3.rse' which would previously raise an IOException on load.
  - Added this test case to the 'testGeneralMotorLoader' method as well.
  - Adjusted the digest string so that 'test3.rse' will pass the unit tests.
  - TestMotorLoader currently passes 5/5 unit tests.
 2014-10-28 13:39:21 -06:00
Daniel_M_Williams
534a61ee7e interim commit. This moves the mass <0 from a separate loop into the previous loop. 2014-10-28 12:14:44 -06:00