diff --git a/.efrocachemap b/.efrocachemap index 682549c6..bfc4d47e 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -1368,6 +1368,10 @@ "build/assets/ba_data/textures/circleZigZag.pvr": "4b300a401102daa24755c1d156e81ada", "build/assets/ba_data/textures/circleZigZag_preview.png": "409fa44a6f89bc745240ec3107042b49", "build/assets/ba_data/textures/circle_preview.png": "84b94c4bf16e27e9483fe683e4e2f5f7", + "build/assets/ba_data/textures/clayStroke.dds": "1ae7ab8d1e212aca724f7313f1b57e61", + "build/assets/ba_data/textures/clayStroke.ktx": "8c648180e290a4acfff1196fa358f042", + "build/assets/ba_data/textures/clayStroke.pvr": "84c31a1a8ab4ea051a5b6a804dd952df", + "build/assets/ba_data/textures/clayStroke_preview.png": "ec248139546f51c007148ef0250a5e0c", "build/assets/ba_data/textures/coin.dds": "e69e7ba8ff87d5ed9ca7c7ab96d13546", "build/assets/ba_data/textures/coin.ktx": "d1de4b2fd4fe028b889ed53a829f9a72", "build/assets/ba_data/textures/coin.pvr": "b8477ed7afdc5e460843e4d8413a2c08", diff --git a/Makefile b/Makefile index 70526b24..75f3f9a9 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ meta-clean: # few things such as localconfig.json). clean: $(CHECK_CLEAN_SAFETY) - rm -rf build # Kill build ourself; may confuse git if contains other repos. + rm -rf build # Kill this ourself; can confuse git if contains other repos. git clean -dfx $(ROOT_CLEAN_IGNORES) # Show what clean would delete without actually deleting it. diff --git a/src/assets/.asset_manifest_private.json b/src/assets/.asset_manifest_private.json index e7849bc5..e467eb04 100644 --- a/src/assets/.asset_manifest_private.json +++ b/src/assets/.asset_manifest_private.json @@ -1389,6 +1389,10 @@ "ba_data/textures/circleZigZag.pvr", "ba_data/textures/circleZigZag_preview.png", "ba_data/textures/circle_preview.png", + "ba_data/textures/clayStroke.dds", + "ba_data/textures/clayStroke.ktx", + "ba_data/textures/clayStroke.pvr", + "ba_data/textures/clayStroke_preview.png", "ba_data/textures/coin.dds", "ba_data/textures/coin.ktx", "ba_data/textures/coin.pvr", diff --git a/src/assets/Makefile b/src/assets/Makefile index 51abad50..54e13697 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -5697,6 +5697,7 @@ TEX2D_DDS_TARGETS = \ $(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.dds \ $(BUILD_DIR)/ba_data/textures/circleShadow.dds \ $(BUILD_DIR)/ba_data/textures/circleZigZag.dds \ + $(BUILD_DIR)/ba_data/textures/clayStroke.dds \ $(BUILD_DIR)/ba_data/textures/coin.dds \ $(BUILD_DIR)/ba_data/textures/controllerIcon.dds \ $(BUILD_DIR)/ba_data/textures/courtyardLevelColor.dds \ @@ -6101,6 +6102,7 @@ TEX2D_PVR_TARGETS = \ $(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.pvr \ $(BUILD_DIR)/ba_data/textures/circleShadow.pvr \ $(BUILD_DIR)/ba_data/textures/circleZigZag.pvr \ + $(BUILD_DIR)/ba_data/textures/clayStroke.pvr \ $(BUILD_DIR)/ba_data/textures/coin.pvr \ $(BUILD_DIR)/ba_data/textures/controllerIcon.pvr \ $(BUILD_DIR)/ba_data/textures/courtyardLevelColor.pvr \ @@ -6505,6 +6507,7 @@ TEX2D_KTX_TARGETS = \ $(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.ktx \ $(BUILD_DIR)/ba_data/textures/circleShadow.ktx \ $(BUILD_DIR)/ba_data/textures/circleZigZag.ktx \ + $(BUILD_DIR)/ba_data/textures/clayStroke.ktx \ $(BUILD_DIR)/ba_data/textures/coin.ktx \ $(BUILD_DIR)/ba_data/textures/controllerIcon.ktx \ $(BUILD_DIR)/ba_data/textures/courtyardLevelColor.ktx \ @@ -6909,6 +6912,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \ $(BUILD_DIR)/ba_data/textures/circleShadow_preview.png \ $(BUILD_DIR)/ba_data/textures/circleZigZag_preview.png \ $(BUILD_DIR)/ba_data/textures/circle_preview.png \ + $(BUILD_DIR)/ba_data/textures/clayStroke_preview.png \ $(BUILD_DIR)/ba_data/textures/coin_preview.png \ $(BUILD_DIR)/ba_data/textures/controllerIcon_preview.png \ $(BUILD_DIR)/ba_data/textures/courtyardLevelColor_preview.png \ diff --git a/src/assets/ba_data/python/bauiv1lib/colorpicker.py b/src/assets/ba_data/python/bauiv1lib/colorpicker.py index 38dc64e6..8d6fcd71 100644 --- a/src/assets/ba_data/python/bauiv1lib/colorpicker.py +++ b/src/assets/ba_data/python/bauiv1lib/colorpicker.py @@ -248,6 +248,7 @@ class ColorPickerExact(PopupWindow): maxwidth=70, allow_clear_button=False, force_internal_editing=True, + glow_type='uniform', ) x = 50