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

1653 Commits

Author SHA1 Message Date
SiboVG
d4cd1655ea Fix nose cone shoulder tab 2023-01-10 23:52:18 +01:00
SiboVG
8386086ed7 Fix radial position tab of inner tube 2023-01-10 23:21:50 +01:00
SiboVG
30a2103645 Fix wide inner tube config dialog 2023-01-10 22:51:36 +01:00
Sibo Van Gool
349c138a0f
Update unit tests slightly (#1962) 
Update unit tests slightly
I guess there was a sim change recently that caused the altitude to increase slightly. It's not the first time that the sim fails here
 2023-01-10 00:52:39 +01:00
SiboVG
0dab094a1a [#1960] Fix wrong naming of library 2023-01-10 00:01:12 +01:00
Sibo Van Gool
042e2ec396
Merge pull request #1958 from SiboVG/unstable 
[#1136] Add JOGL for macOS arm64 architecture - Fixes 3D support on macOS Silicon in Java 17
 2023-01-09 07:27:37 +01:00
H Craig Miller
15ca3bc738 Update Pods--airframes and winglets.ork 
Added Pods--airframes and winglets. I don't know why it was glitched, but I couldn't replicate the glitch.
 2023-01-08 19:21:39 -08:00
H Craig Miller
f128d9561c
Merge branch 'openrocket:unstable' into Update-examples-reduce-descent-fps 2023-01-08 19:14:55 -08:00
SiboVG
001414097f Update jogl-all to fix #1156 (again) - hopefully 2023-01-09 00:57:35 +01:00
SiboVG
b2d19181b1 Don't clear config listeners on document undo 2023-01-08 23:36:06 +01:00
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
e58761b1eb Merge branch 'unstable' into issue-960 
# Conflicts:
#	core/resources/l10n/messages.properties
 2023-01-08 04:39:26 +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
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
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
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
SiboVG
cdfac5f649 [#1942] Fix text component selection key behavior 2023-01-06 14:30:28 +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
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
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
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
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
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
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
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