Merge remote-tracking branch 'origin/develop' into develop

Fork: 0

root / DungeonShooting

Browse code Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # DungeonShooting_Godot/resource/sprite/role/enemy002/enemy0002_Debris.png.import # DungeonShooting_Godot/resource/sprite/role/enemy002/enemy0002_Icon.png.import # DungeonShooting_Godot/resource/sprite/role/enemy002/enemy002.png.import # DungeonShooting_Godot/resource/sprite/role/enemy003/enemy003.png.import # DungeonShooting_Godot/resource/sprite/role/enemy004/enemy004.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0002.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0003.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0004.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0005.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0006.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0007.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0008.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/dle/Sprite-0002-Sheet-export.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/dle/Sprite-0002.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0002.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0003.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0004.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0005.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0006.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0007.png.import # DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0008.png.import develop
commit a3150240b36544955b1cf57d218fb5732a543156 2 parents 956ced1 + b079f56 小李xl authored on 10 Apr 2024

Browse code

# Conflicts:
#	DungeonShooting_Godot/resource/sprite/role/enemy002/enemy0002_Debris.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy002/enemy0002_Icon.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy002/enemy002.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy003/enemy003.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy004/enemy004.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0002.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0003.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0004.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0005.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0006.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0007.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/backward/Sprite-0008.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/dle/Sprite-0002-Sheet-export.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/dle/Sprite-0002.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0002.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0003.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0004.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0005.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0006.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0007.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0008.png.import

develop

commit a3150240b36544955b1cf57d218fb5732a543156

2 parents 956ced1 + b079f56

小李xl authored on 10 Apr 2024

Patch

Unified Split

Showing 21 changed files

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/item/hall_a/Slice_02.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy002/enemy0002_Icon.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy003/enemy0002_Debris.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy003/enemy0002_Debris.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy003/enemy0002_Icon.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy003/enemy0002_Icon.png.import 0 → 100644

Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/Role0001.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/Role0001.png.import 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/enemy0004_Debris.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/enemy0004_Debris.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/enemy0004_Icon.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/enemy0004_Icon.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/enemy004.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy004/enemy004.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy005/enemy005.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy005/enemy005.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/shopBoss0001/ShopBoss0001.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/shopBoss0001/ShopBoss0002.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/shopBoss0001/ShopBoss0002.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/scene/Hall.tscn

Show line notes below