Merge branch 'main' into dr_game/rust_render

# Conflicts: # mods/dr_game/sr1_ship.py
fix #46
2023-07-21 21:38:26 +08:00 · 2023-07-21 20:44:44 +08:00
1 changed files with 0 additions and 2 deletions
--- a/mods/dr_game/sr1_ship.py
+++ b/mods/dr_game/sr1_ship.py
@ -215,8 +215,6 @@ class SR1ShipRender(BaseScreen):
            #     cache_sprite.scale_x = -1
            # if part.flip_y:
            #     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
            if DR_mod_runtime.use_DR_rust:
Author	SHA1	Message	Date
shenjack	204115d7c7	Merge branch 'main' into dr_game/rust_render # Conflicts: # mods/dr_game/sr1_ship.py	2023-07-21 21:38:26 +08:00
shenjack	cd0d9071e2	fix #46	2023-07-21 20:44:44 +08:00