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 |
|
Joe Pfeiffer
|
1d13bdc593
|
Merge pull request #2529 from JoePfeiffer/fix-852
Add more stage separation options for deployable payloads and a deployable payload example
|
2024-08-12 12:19:00 -06:00 |
|
JoePfeiffer
|
ae17468daa
|
Merge branch 'unstable' into fix-852
|
2024-08-12 12:08:42 -06:00 |
|
Sibo Van Gool
|
c188f1cc96
|
Merge pull request #2533 from SiboVG/fix-simplot-vars
Fix simplot vars
|
2024-08-12 17:20:59 +02: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 |
|
Joe Pfeiffer
|
42f38ad749
|
Merge pull request #2527 from SiboVG/material-groups
Introduce material groups, document materials, and document preferences + Refactor material panel to use searchable and groupable combobox
|
2024-08-11 09:56:44 -06: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 |
|
Joe Pfeiffer
|
e52374c6e4
|
Merge pull request #2528 from SiboVG/code-cleanup
Code cleanup
|
2024-08-09 11:34:54 -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
|
29aa71f397
|
Replace old package name with new one for simulation extensions
|
2024-08-09 06:12:12 +02:00 |
|
SiboVG
|
5e77e3670a
|
Fix range because of GM scale 2
|
2024-08-09 06:03:06 +02:00 |
|
SiboVG
|
bf0e5eaeaf
|
Forgot assertsame import
|
2024-08-09 06:02:52 +02:00 |
|
SiboVG
|
d311ee6cc0
|
Use assertSame
|
2024-08-09 05:48:23 +02:00 |
|
SiboVG
|
b5d9343ff0
|
Add missing Test annotations
|
2024-08-09 05:47:07 +02:00 |
|
SiboVG
|
7d2c3c0676
|
Use String equals
|
2024-08-09 05:44:46 +02: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
|
5174eebb3a
|
Use try with resources
|
2024-08-09 05:30:10 +02:00 |
|
SiboVG
|
aebb8b87d2
|
Use enhanced switch
|
2024-08-09 05:22:01 +02:00 |
|
SiboVG
|
4952320030
|
Use String.contains
|
2024-08-09 05:20:51 +02:00 |
|
SiboVG
|
fd3f2e167c
|
Use enhanced for-loops
|
2024-08-09 05:20:27 +02:00 |
|
SiboVG
|
7678a1226f
|
Use standard hashcode methods
|
2024-08-09 05:20:00 +02:00 |
|
SiboVG
|
71d1c02070
|
Simplify map operations
|
2024-08-09 05:19:07 +02:00 |
|
SiboVG
|
f28cf9acb8
|
Use RemoveIf
|
2024-08-09 05:18:45 +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
|
7fd90efd3d
|
Use Object.equals
|
2024-08-09 05:17:34 +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
|
b0169b6a2a
|
Remove unnecessary imports from java.lang
|
2024-08-09 04:37:46 +02:00 |
|
SiboVG
|
8d8b6a93cf
|
Remove unnecessary imports from the same package
|
2024-08-09 04:37:27 +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 |
|
Sibo Van Gool
|
53b2e92cbd
|
Merge pull request #2522 from JoePfeiffer/modid
Replace UniqueID class with ModID and UUID
|
2024-08-09 04:27:25 +02:00 |
|
SiboVG
|
5aff7ff066
|
Fix database trans in unit tests
|
2024-08-09 01:22:26 +02:00 |
|
SiboVG
|
a27ab137cc
|
Somewhat fix menu items still being opened when not hovered over
|
2024-08-09 01:07:39 +02:00 |
|