Merge branch 'main' into dr_game/rust_render

# Conflicts:
#	mods/dr_game/sr1_ship.py
This commit is contained in:
shenjack 2023-07-21 21:38:26 +08:00
commit 204115d7c7
Signed by: shenjack
GPG Key ID: 7B1134A979775551

View File

@ -215,8 +215,6 @@ class SR1ShipRender(BaseScreen):
# cache_sprite.scale_x = -1 # cache_sprite.scale_x = -1
# if part.flip_y: # if part.flip_y:
# cache_sprite.scale_y = -1 # cache_sprite.scale_y = -1
# cache_sprite.x = cache_sprite.x - cache_sprite.scale_x / 2
# cache_sprite.y = cache_sprite.y - cache_sprite.scale_y / 2
# self.parts_sprite[part.id] = cache_sprite # self.parts_sprite[part.id] = cache_sprite
if DR_mod_runtime.use_DR_rust: if DR_mod_runtime.use_DR_rust: