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

2245 Commits

Author SHA1 Message Date
neil.weinstock@gmail.com
efc043d2b4 Small fix 2024-10-08 21:54:56 -04:00
neil.weinstock@gmail.com
65ebf9de72 Implement angle constraints in fin editor 2024-10-08 20:57:49 -04:00
Sibo Van Gool
29598ef1b1
Merge pull request #2530 from NCoppola25/issue-2521 
[fixes #2521]
 2024-08-18 13:26:39 +02:00
Sibo Van Gool
7f8049c73d
Merge pull request #2538 from SiboVG/issue-2537 
[#2537] Allow for reconfiguration of the default flight config name
 2024-08-14 12:36:43 +02:00
Sibo Van Gool
79a2998ae2
Merge pull request #2534 from SiboVG/issue-2531 
[#2531] Don't close edit sim dialog after plotting or exporting
 2024-08-14 12:34:20 +02:00
SiboVG
c598004ba0 [#2537] Allow for reconfiguration of the default flight config name 2024-08-13 19:39:26 +02:00
NickC25
928f56e308 Fix broken plot when selecting a specific stage 2024-08-12 21:30:26 -05:00
SiboVG
ac520e7148 Remove SelectColorButton and SelectColorToggleButton 
Not needed anymore thanks to FlatLaf
 2024-08-12 23:54:27 +02:00
SiboVG
cc738bbeaf Also set OSX properties on main thread, so settings apply properly 
(still doesn't work though...)
 2024-08-12 22:23:12 +02:00
SiboVG
fe162d4abf Improve colors for borderColor 2024-08-12 21:39:16 +02:00
SiboVG
6e247b273d [#2531] Don't close edit sim dialog after plotting or exporting 2024-08-12 21:12:28 +02:00
JoePfeiffer
ae17468daa Merge branch 'unstable' into fix-852 2024-08-12 12:08:42 -06:00
SiboVG
1f6df48d97 Ensure new model uses the selected item from the old model 2024-08-12 17:20:06 +02:00
SiboVG
3f47259bf5 Remove unnecessary code 2024-08-12 16:59:38 +02:00
Nick Coppola
1fbbea5736
Merge branch 'openrocket:unstable' into issue-2521 2024-08-11 16:28:55 -05:00
NickC25
43eb329e46 [#2521] Add stage description to sim plot tooltips for the main rocket, including the sustainer 2024-08-11 16:24:57 -05:00
SiboVG
bc60e30c72 Ensure Material Combobox closes when using buttons 2024-08-11 16:25:59 +02:00
SiboVG
4dbbc0f4fd Fix JMenu deselection issue 2024-08-11 12:14:25 +02:00
SiboVG
a38230a05e Merge branch 'refs/heads/unstable' into material-groups 
# Conflicts:
#	core/src/main/java/info/openrocket/core/database/Databases.java
#	core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java
#	core/src/main/java/info/openrocket/core/material/Material.java
#	swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java
#	swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java
#	swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java
#	swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java
#	swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java
#	swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java
 2024-08-09 20:46:55 +02:00
JoePfeiffer
b183a571c4 Merge branch 'unstable' into fix-852 2024-08-09 11:47:52 -06:00
SiboVG
9f247a6ef9 Also use MaterialComboBox for other material widgets 2024-08-09 19:05:58 +02:00
SiboVG
c963d8104c Merge branch 'refs/heads/unstable' into material-groups 
# Conflicts:
#	core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java
#	core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java
 2024-08-09 18:30:18 +02:00
SiboVG
d6cb2e84cc Refactor to GroupableAndSearchableComboBox 2024-08-09 18:24:31 +02:00
SiboVG
383bb4e4bb Use JCheckBoxMenuItem instead of custom painting 2024-08-09 18:16:53 +02:00
SiboVG
cb86446b22 Revert "fix" for going outside menu group 2024-08-09 18:07:24 +02:00
JoePfeiffer
ae501caab4 Merge branch 'unstable' into fix-852 2024-08-09 10:03:24 -06:00
JoePfeiffer
29a6c05035 Add deployable payload example 2024-08-09 10:00:34 -06:00
SiboVG
1c5bddf54b Fix small numerical issues 2024-08-09 05:37:47 +02:00
SiboVG
64b2b9a40e Fix combobox infer 2024-08-09 05:31:17 +02:00
SiboVG
aebb8b87d2 Use enhanced switch 2024-08-09 05:22:01 +02:00
SiboVG
fd3f2e167c Use enhanced for-loops 2024-08-09 05:20:27 +02:00
SiboVG
71d1c02070 Simplify map operations 2024-08-09 05:19:07 +02:00
SiboVG
0533ba23a0 Use Comparator.comparing 2024-08-09 05:18:30 +02:00
SiboVG
eaf59aeb75 Replace Collections.sort with List.sort 2024-08-09 05:18:08 +02:00
SiboVG
8df1fa881a Collapse catch blocks 2024-08-09 05:17:16 +02:00
SiboVG
3f8b35343c Replace try finally with try with resources 2024-08-09 05:16:41 +02:00
SiboVG
595406ab68 Replace explicit type with <> 2024-08-09 05:15:51 +02:00
SiboVG
aef972699a Performance improvements 2024-08-09 05:14:37 +02:00
SiboVG
9cde5c9766 Replace wildcard imports with single imports 2024-08-09 05:07:41 +02:00
SiboVG
af7f26ab48 Remove unused imports 2024-08-09 04:36:51 +02:00
JoePfeiffer
ef9a5d6c2b Create stage separation conditions of specific altitude during ascent, apogee, and specific altitude during descent to support payloads with separate descent 2024-08-08 20:35:08 -06:00
SiboVG
a27ab137cc Somewhat fix menu items still being opened when not hovered over 2024-08-09 01:07:39 +02:00
SiboVG
e4ca56f8e8 Refactor SearchableAndCategorizableComboBox to group instead of category 2024-08-09 00:05:48 +02:00
SiboVG
117d7d79df Ensure to set old material to doc material 2024-08-08 23:57:13 +02:00
SiboVG
2a53ee9420 Allow taking group from user-defined materials 2024-08-08 23:40:31 +02:00
SiboVG
cee3cb04ae Fix component material not being updated after editing it in the preferences 2024-08-08 23:36:58 +02:00
SiboVG
370e6bffd7 Fix hiding popups after selection 2024-08-08 23:04:37 +02:00
SiboVG
9f0b7c9b15 Check when a material to be removed is in use by a component 2024-08-08 22:43:21 +02:00
SiboVG
e63e521e90 Refactor material addition/removal 2024-08-08 22:01:29 +02:00
SiboVG
b5ff851263 Disable material doc material just to be sure 2024-08-08 21:43:40 +02:00