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 |
|
SiboVG
|
29aa71f397
|
Replace old package name with new one for simulation extensions
|
2024-08-09 06:12:12 +02: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 |
|
SiboVG
|
45dcf0d81d
|
Whoops, there were some British spellings of 'fiber'
|
2024-08-09 00:14: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 |
|
SiboVG
|
46a941968e
|
Add unit tests for material
|
2024-08-08 21:39:16 +02:00 |
|
SiboVG
|
09d6137ac0
|
Use dedicated methods for adding/removing doc materials
|
2024-08-08 19:24:17 +02:00 |
|
SiboVG
|
de61ffe174
|
Also load material to doc mats when setting material
|
2024-08-08 18:47:55 +02:00 |
|
SiboVG
|
e5f0ff9322
|
Save component preset material in document preferences
|
2024-08-08 12:06:55 +02:00 |
|
SiboVG
|
7472ad7c8c
|
Save reference to document in rocket
|
2024-08-08 12:05:41 +02:00 |
|
SiboVG
|
00acb8b68f
|
Always start from a blank material when creating a new custom material
|
2024-08-07 23:57:01 +02:00 |
|
SiboVG
|
48e9536769
|
Goddamn, this index issue caused me so much trouble
Fixes updating combobox after adding custom material
|
2024-08-07 23:12:42 +02:00 |
|
SiboVG
|
16bd21bb90
|
Fix triggering of model after item change
|
2024-08-07 21:40:34 +02:00 |
|
SiboVG
|
b0feb33459
|
Construct itemGroup within SearchableAndCategorizableComboBox
|
2024-08-07 21:27:15 +02:00 |
|
SiboVG
|
354843deb9
|
Refactor SearchableAndCategorizableComboBox
|
2024-08-07 18:56:31 +02:00 |
|
SiboVG
|
0d5952cfa3
|
Refactor doc material loading to OpenRocketDocument
|
2024-08-07 15:41:04 +02:00 |
|
SiboVG
|
65116fcb58
|
Support material group loading from preset
|
2024-08-07 14:52:11 +02:00 |
|
SiboVG
|
e3ce3ac7dd
|
Refactor SearchableAndCategorizableComboBox to use Group and Groupable interface
|
2024-08-07 14:19:46 +02:00 |
|
SiboVG
|
691f79fe3c
|
Save material group in ork material
|
2024-08-07 12:58:37 +02:00 |
|
SiboVG
|
2e8accf097
|
Also add checkmark to selected group
|
2024-08-07 12:48:41 +02:00 |
|
SiboVG
|
693f2625ba
|
Update materialmodel after combobox change
|
2024-08-07 12:45:28 +02:00 |
|
SiboVG
|
bb1d3dd3e8
|
Use == instead of equals for item check
|
2024-08-07 12:39:13 +02:00 |
|
SiboVG
|
f2fbcc69d3
|
Set material group non-null in the constructor
|
2024-08-07 12:17:34 +02:00 |
|
SiboVG
|
4e45a194e2
|
Fix material key in doc mat loader
|
2024-08-07 12:08:45 +02:00 |
|
SiboVG
|
829109ee2d
|
Display user-defined materials with (ud) prefix
|
2024-08-07 12:01:08 +02:00 |
|
SiboVG
|
faeec8e854
|
Use enhanced loop
|
2024-08-07 11:51:02 +02:00 |
|
SiboVG
|
98da7340fe
|
Add checkmark for the currently selected item
|
2024-08-07 11:28:15 +02:00 |
|
SiboVG
|
481d9a7355
|
Always store group in storable string
|
2024-08-07 11:17:28 +02:00 |
|
SiboVG
|
28ca2e98c6
|
Fix loading custom materials from old OR files
|
2024-08-07 11:12:22 +02:00 |
|
Joe Pfeiffer
|
9ef1139515
|
Merge pull request #2523 from JoePfeiffer/fix-spherachutes
Correct diameter of Spheachutes parachuts to match Cd and correct spelling of "drouge"
|
2024-08-02 10:53:10 -06:00 |
|
JoePfeiffer
|
3b7e9bcec7
|
Correct diameter of Spheachutes parachuts to match Cd.
Correct spelling of "drouge"
|
2024-07-26 15:21:26 -06:00 |
|
JoePfeiffer
|
6c732a7c0d
|
comment was wrong
|
2024-07-26 10:02:39 -06:00 |
|
JoePfeiffer
|
eb9106a6a4
|
Be more consistent about creating a new modID when changes take place
|
2024-07-26 09:26:50 -06:00 |
|
JoePfeiffer
|
0e437a8cb7
|
Split UniqueID functionality into new ModID class and java UUID
|
2024-07-26 06:46:32 -06:00 |
|
SiboVG
|
8dcb120cc5
|
Add option to select material group in material editor
|
2024-07-24 22:48:21 +02:00 |
|
SiboVG
|
5d45d075ce
|
Save document materials in document preferences
|
2024-07-23 00:34:59 +02:00 |
|
SiboVG
|
500c75aeab
|
Save document preferences in design file
|
2024-07-22 00:02:08 +02:00 |
|
SiboVG
|
144efb5610
|
Allow for configurable entry tag name
|
2024-07-21 23:58:54 +02:00 |
|