RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-08 16:53:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

clayStroke asset and polishing

Browse Source
This commit is contained in:
Eric 2024-03-14 16:27:17 -07:00
parent c7140928c5
commit b329d8621c
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.efrocachemap generated
View File

@ -1368,6 +1368,10 @@
"build/assets/ba_data/textures/circleZigZag.pvr": "4b300a401102daa24755c1d156e81ada", "build/assets/ba_data/textures/circleZigZag.pvr": "4b300a401102daa24755c1d156e81ada",
"build/assets/ba_data/textures/circleZigZag_preview.png": "409fa44a6f89bc745240ec3107042b49", "build/assets/ba_data/textures/circleZigZag_preview.png": "409fa44a6f89bc745240ec3107042b49",
"build/assets/ba_data/textures/circle_preview.png": "84b94c4bf16e27e9483fe683e4e2f5f7", "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.dds": "e69e7ba8ff87d5ed9ca7c7ab96d13546",
"build/assets/ba_data/textures/coin.ktx": "d1de4b2fd4fe028b889ed53a829f9a72", "build/assets/ba_data/textures/coin.ktx": "d1de4b2fd4fe028b889ed53a829f9a72",
"build/assets/ba_data/textures/coin.pvr": "b8477ed7afdc5e460843e4d8413a2c08", "build/assets/ba_data/textures/coin.pvr": "b8477ed7afdc5e460843e4d8413a2c08",

2
Makefile
View File

@ -151,7 +151,7 @@ meta-clean:
# few things such as localconfig.json). # few things such as localconfig.json).
clean: clean:
$(CHECK_CLEAN_SAFETY) $(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) git clean -dfx $(ROOT_CLEAN_IGNORES)
# Show what clean would delete without actually deleting it. # Show what clean would delete without actually deleting it.

4
src/assets/.asset_manifest_private.json
View File

@ -1389,6 +1389,10 @@
"ba_data/textures/circleZigZag.pvr", "ba_data/textures/circleZigZag.pvr",
"ba_data/textures/circleZigZag_preview.png", "ba_data/textures/circleZigZag_preview.png",
"ba_data/textures/circle_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.dds",
"ba_data/textures/coin.ktx", "ba_data/textures/coin.ktx",
"ba_data/textures/coin.pvr", "ba_data/textures/coin.pvr",

4
src/assets/Makefile
View File

@ -5697,6 +5697,7 @@ TEX2D_DDS_TARGETS = \
$(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.dds \ $(BUILD_DIR)/ba_data/textures/circleOutlineNoAlpha.dds \
$(BUILD_DIR)/ba_data/textures/circleShadow.dds \ $(BUILD_DIR)/ba_data/textures/circleShadow.dds \
$(BUILD_DIR)/ba_data/textures/circleZigZag.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/coin.dds \
$(BUILD_DIR)/ba_data/textures/controllerIcon.dds \ $(BUILD_DIR)/ba_data/textures/controllerIcon.dds \
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor.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/circleOutlineNoAlpha.pvr \
$(BUILD_DIR)/ba_data/textures/circleShadow.pvr \ $(BUILD_DIR)/ba_data/textures/circleShadow.pvr \
$(BUILD_DIR)/ba_data/textures/circleZigZag.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/coin.pvr \
$(BUILD_DIR)/ba_data/textures/controllerIcon.pvr \ $(BUILD_DIR)/ba_data/textures/controllerIcon.pvr \
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor.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/circleOutlineNoAlpha.ktx \
$(BUILD_DIR)/ba_data/textures/circleShadow.ktx \ $(BUILD_DIR)/ba_data/textures/circleShadow.ktx \
$(BUILD_DIR)/ba_data/textures/circleZigZag.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/coin.ktx \
$(BUILD_DIR)/ba_data/textures/controllerIcon.ktx \ $(BUILD_DIR)/ba_data/textures/controllerIcon.ktx \
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor.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/circleShadow_preview.png \
$(BUILD_DIR)/ba_data/textures/circleZigZag_preview.png \ $(BUILD_DIR)/ba_data/textures/circleZigZag_preview.png \
$(BUILD_DIR)/ba_data/textures/circle_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/coin_preview.png \
$(BUILD_DIR)/ba_data/textures/controllerIcon_preview.png \ $(BUILD_DIR)/ba_data/textures/controllerIcon_preview.png \
$(BUILD_DIR)/ba_data/textures/courtyardLevelColor_preview.png \ $(BUILD_DIR)/ba_data/textures/courtyardLevelColor_preview.png \

1
src/assets/ba_data/python/bauiv1lib/colorpicker.py
View File

@ -248,6 +248,7 @@ class ColorPickerExact(PopupWindow):
maxwidth=70, maxwidth=70,
allow_clear_button=False, allow_clear_button=False,
force_internal_editing=True, force_internal_editing=True,
glow_type='uniform',
) )
x = 50 x = 50