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

4788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SiboVG
01bdf1112f Add JOGL for macOS arm64 architecture 2023-01-08 22:58:39 +01:00
SiboVG
7ea17b01d2 Don't close config dialog if cancel no option selected 2023-01-08 18:19:54 +01:00
SiboVG
75f1ab0cfb Remove unneeded translation 2023-01-08 04:57:33 +01:00
SiboVG
9b805e2a0b Merge remote-tracking branch 'origin/issue-960' into issue-960 2023-01-08 04:39:39 +01:00
SiboVG
e58761b1eb Merge branch 'unstable' into issue-960 
# Conflicts:
#	core/resources/l10n/messages.properties
 2023-01-08 04:39:26 +01:00
SiboVG
48d0156a35 Merge branch 'unstable' into issue-960 
# Conflicts:
#	core/resources/l10n/messages.properties
 2023-01-08 04:33:30 +01:00
SiboVG
a3646cdbf8 Documentation update 2023-01-08 04:25:53 +01:00
SiboVG
e8638b25cf [#1956] Fix issue in multi-comp edit during undo operation 
At least I hope this fixes it; it was a weird bug and hard to replicate...
 2023-01-08 04:25:53 +01:00
SiboVG
ac03080588 Add multi-comp edit for nose cone flip 2023-01-08 03:11:26 +01:00
SiboVG
0120ba7bcc [#960] Add OK/Cancel button in component config + modified symbol 2023-01-08 02:47:58 +01:00
JoePfeiffer
f61b8799ab Name chutes "main" and "drogue", not part number. 2023-01-07 15:54:24 -07:00
JoePfeiffer
b4a6022de2 change parachute sizes for safer descent rates 2023-01-07 15:50:16 -07:00
H Craig Miller
d27a836622 Update example parachutes to reduce descent fps 
Adjusted example parachutes to reduce descent fps on mains to about or less than 18 fps and on drogues to about or less than 90 fps. The affected examples are: Two-stage rocket, TARC payload rocket, Airstart rocket, and Dual parachute deployment rocket.
 2023-01-07 11:29:53 -08:00
JoePfeiffer
ba64ba2f1a add revised scripting example 2023-01-07 08:07:36 -07:00
Joe Pfeiffer
00d7ec5891
Merge pull request #1952 from SiboVG/issue-1564 
[#1564] Add component information box
 2023-01-06 18:40:51 -07:00
SiboVG
272fa8651a Re-add imports 2023-01-07 01:43:07 +01:00
SiboVG
8124918cdf Merge branch 'unstable' into issue-1564 2023-01-07 01:39:34 +01:00
SiboVG
878654787d Change 'glider' to 'strap-on booster' 2023-01-07 00:43:41 +01:00
Neil Weinstock
94d376540a
New app icons (#1944) 
Add new app icons
 2023-01-07 00:41:33 +01:00
Joe Pfeiffer
d60045baca
Merge pull request #1953 from SiboVG/issue-1942 
[#1942] Fix text component selection key behavior
 2023-01-06 16:22:27 -07:00
JoePfeiffer
ee8fe7f089 Modified simulation scripting example to use JavaScript for both listeners. 
Modified simulation extension example to tell users where to look for the code for the extensions
 2023-01-06 15:43:51 -07:00
Sibo Van Gool
baf5879093
Merge pull request #1951 from hcraigmiller/Re-run-powered-pods 
Update Pods--powered with recovery deployment.ork
 2023-01-06 14:35:40 +01:00
SiboVG
cdfac5f649 [#1942] Fix text component selection key behavior 2023-01-06 14:30:28 +01:00
SiboVG
8442c2a972 Minor changes to wording 2023-01-06 00:42:38 +01:00
SiboVG
9311ac27ba Don't add the component info panel for multi-comp edits 2023-01-05 23:34:15 +01:00
SiboVG
10d36145cf [#1564] Add component information box 2023-01-05 23:18:38 +01:00
H Craig Miller
278930cb48 Update Pods--powered with recovery deployment.ork 
Updated to include simulations after merge of pod recovery changes.
 2023-01-05 14:02:29 -08:00
Billy Olsen
96bc101b02
Merge pull request #1949 from JoePfeiffer/fix-1910 
Consider number of parachutes in landing drag calculation
 2023-01-05 14:46:22 -07:00
Joe Pfeiffer
4010fe3f5b
Merge pull request #1947 from JoePfeiffer/tumble-solve-for-0 
Solve time step for ground hit in tumble stepper
 2023-01-05 10:55:58 -07:00
Joe Pfeiffer
05e894c1f2
Merge pull request #1945 from JoePfeiffer/fix-1938 
Inhibit reignition of already ignited motor
 2023-01-05 10:52:43 -07:00
Joe Pfeiffer
9c46f85425
Merge pull request #1931 from JoePfeiffer/add-open-airframe-warning 
Add open airframe warning and use text compare to find airframe discontinuities
 2023-01-05 10:49:01 -07:00
JoePfeiffer
fbbe43390d Consider number of parachutes in landing drag calculation 2023-01-05 10:33:42 -07:00
JoePfeiffer
a7c205281d Solve time step for ground hit in tumble stepper 2023-01-04 14:33:19 -07:00
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