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

4755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JoePfeiffer
a4fdc333ad Inhibit reignition of already ignited motor 
If a later stage motor's ignition event is triggered by burnout of earlier stage motors, an ignition even gets queued for every burnout in the earlier stage. This checks to see if a motor is already burning when an ignition event is processed for it, and ignores the event if so.
 2023-01-04 09:21:15 -07:00
JoePfeiffer
da1130fd97 Require next and previous symmetric components be in line. Avoids having "next" and "previous" go off between pods 2023-01-03 18:46:53 -07:00
JoePfeiffer
b3d2b92edd Merge remote-tracking branch 'origin/unstable' into add-open-airframe-warning 2023-01-03 18:46:26 -07:00
Sibo Van Gool
ede9dfe700
Merge pull request #1940 from hcraigmiller/Rename-and-re-order-examples 
Rename and re-order example designs
 2023-01-01 14:24:55 +01:00
Sibo Van Gool
2e6622ec83
Merge pull request #1941 from SiboVG/unstable 
Increase error margin
 2023-01-01 14:24:15 +01:00
SiboVG
5ad66e9151 Increase error margin 2023-01-01 14:22:47 +01:00
Sibo Van Gool
422f0049e2
Merge pull request #1935 from SiboVG/event-icons 
Add option to switch (time) flight event markers to icons
 2023-01-01 14:18:13 +01:00
H Craig Miller
64b6942e75 Update ExampleDesignFileAction.java 
Changes requested by @SiboVG
 2022-12-31 23:47:37 -08:00
H Craig Miller
de2e65623f Merge remote-tracking branch 'origin/Rename-and-re-order-examples' into Rename-and-re-order-examples 2022-12-31 23:46:54 -08:00
SiboVG
1722459147 Add custom design file ordering + separator 2022-12-31 23:39:56 -08:00
SiboVG
a3252e3d15 Change "Vertical marker" to "Vertical line" 2023-01-01 05:22:36 +01:00
SiboVG
b4b4b20748 Add custom design file ordering + separator 2023-01-01 05:16:48 +01:00
H Craig Miller
7859cd1ed4 Rename and re-order example designs 
Rename and re-order example designs
 2022-12-31 12:43:47 -08:00
SiboVG
c374f616b9 Fix icon marker plotting for branch == -1 2022-12-30 20:32:33 +01:00
SiboVG
6cdc2d920e Fix icon marker plot for multiple branches 2022-12-30 18:32:37 +01:00
Sibo Van Gool
7d52f278c2
Merge pull request #1936 from SiboVG/unstable 
Re-add nose cone config translations
 2022-12-30 00:05:32 +01:00
SiboVG
eedaf49644 Re-add nose cone config translations 2022-12-30 00:04:24 +01:00
SiboVG
29a737f38b Remove redundant boxing 2022-12-29 23:56:16 +01:00
SiboVG
7b88cb468e Add option to switch (time) flight event markers to icons 2022-12-29 23:56:16 +01:00
SiboVG
447a025545 Improve tooltip text for flight event icons 2022-12-29 23:56:16 +01:00
Joe Pfeiffer
a271b48db1
Merge branch 'openrocket:unstable' into add-open-airframe-warning 2022-12-28 18:14:30 -07:00
Sibo Van Gool
ffc7daad0a
Merge pull request #1917 from neilweinstock/pod-example 
Updated Pods Example Rocket
 2022-12-29 01:03:10 +01:00
Sibo Van Gool
23b19fd9f0
Merge pull request #1929 from SiboVG/issue-1926 
[#1926] Switch to match fore diameter when nose cone is flipped
 2022-12-29 00:05:34 +01:00
JoePfeiffer
7ff06980b2 Use string displaying diameters instead of mathematical comparison of diameters 
to set discontinuity warning
 2022-12-28 11:36:10 -07:00
JoePfeiffer
d0c19efd3d Add check for open airframe forward end 
Also, it turned out the discontinuity check didn't correctly check across stages (so it wouldn't notice if the aft end of one state wasn't the same as the forward end of the next).  Fixed.
 2022-12-28 11:01:54 -07:00
JoePfeiffer
30cedd9215 Instead of just checking continuity, we're doing a few more sanity checks on 
SymmetricComponent geometry.
 2022-12-27 17:59:07 -07:00
Joe Pfeiffer
c8e98cf319
Merge pull request #1930 from SiboVG/darker-warning 
Darker warning color
 2022-12-27 14:31:08 -07:00
SiboVG
f201471f78 Darker warning color 2022-12-27 20:42:50 +01:00
Sibo Van Gool
d417b179cf
Merge pull request #1924 from JoePfeiffer/fix-1898 
Throw exception at simulation startup if CP can't be calculated.
 2022-12-27 20:13:06 +01:00
Sibo Van Gool
e9064dc759
Merge pull request #1927 from JoePfeiffer/display-NaN-as-N/A 
Display nan as n/a
 2022-12-27 12:07:23 +01:00
Sibo Van Gool
5b73925634
Merge pull request #1916 from hcraigmiller/Change-side-view-to-top-view 
[#1893] Add top view option to 2D display
 2022-12-26 14:36:42 +01:00
SiboVG
f9bd7e672c [#1926] Switch to match fore diameter when nose cone is flipped 2022-12-26 14:23:03 +01:00
SiboVG
3306ed0f50 Merge remote-tracking branch 'origin/Change-side-view-to-top-view' into Change-side-view-to-top-view 2022-12-25 10:41:24 +01:00
SiboVG
16ec1ad48f Set top view above side view 2022-12-25 10:41:01 +01:00
H Craig Miller
ecb7b5da7a
Merge branch 'openrocket:unstable' into Change-side-view-to-top-view 2022-12-24 21:56:44 -08:00
JoePfeiffer
b89a5aa35c If rocket CP weight is less than or equal to 0, display it as N/A in ComponentAnalysisDialog. This brings it in agreement with the CP display in the RocketPanel, and more clearly expresses a problem with the deisgn. 2022-12-24 20:11:34 -07:00
JoePfeiffer
19aed2a216 Unit.toString() now displays NaN as N/A. This brings it in agreement with 
Unit.toStringUnit()
 2022-12-24 20:10:33 -07:00
Sibo Van Gool
4d65a65a30
Merge pull request #1925 from neilweinstock/stage-icon 
Stage icon
 2022-12-25 00:21:49 +01:00
Neil Weinstock
91dde69f42
Fixed discontinuity error 2022-12-24 17:20:19 -05:00
Neil Weinstock
84c5485f8f
Use a reversed nose cone as the pod tail 2022-12-24 16:56:59 -05:00
Neil Weinstock
22ee62dac0
Clean up large stage icon 2022-12-24 14:29:30 -05:00
Neil Weinstock
ed0f54f8a6
Cleaned up large stage icon 2022-12-24 14:28:57 -05:00
JoePfeiffer
18763d6fdd Throw exception at simulation startup if CP can't be calculated. 
Exception says "Can't calculate rocket stability."
 2022-12-24 11:36:41 -07:00
Joe Pfeiffer
140fc26284
Merge pull request #1922 from hcraigmiller/Update-Boosted-Dart 
[Bug] Update Boosted Dart.ork
 2022-12-24 11:07:24 -07:00
Joe Pfeiffer
f107a410d5
Merge pull request #1921 from hcraigmiller/Add-Plugged 
Add "Plugged" to delay options
 2022-12-24 11:06:00 -07:00
Joe Pfeiffer
32583eb9d0
Merge pull request #1920 from SiboVG/issue-1919 
Generalize error-catching of motor file loading
 2022-12-24 11:02:14 -07:00
Joe Pfeiffer
bf8ddca6ff
Merge pull request #1918 from SiboVG/unstable 
Uniform bug report info section + add user-defined thrust curves location
 2022-12-24 10:56:23 -07:00
Joe Pfeiffer
a761ec5656
Merge pull request #1911 from SiboVG/issue-1889 
[#1889] Add support for tail cones
 2022-12-24 10:53:09 -07:00
Joe Pfeiffer
f4b57a9cac
Merge pull request #1909 from JoePfeiffer/require-designation-match 
Require designation match
 2022-12-24 10:52:19 -07:00
H Craig Miller
ea4f52cb77 Update Boosted Dart.ork 
In current unstable, the Boosted Dart example is throwing an invalid parameter error. This PR updates that file so that no error is thrown.
 2022-12-24 06:11:07 -08:00