diff options
| author | dusoleil <howcansocksbereal@gmail.com> | 2022-09-20 17:01:14 -0400 |
|---|---|---|
| committer | dusoleil <howcansocksbereal@gmail.com> | 2022-09-20 17:01:14 -0400 |
| commit | 6b009edae79606cf9714474abf66031e343195aa (patch) | |
| tree | e1ea682dec10774d71c60e362718d043528bdd3b /ship | |
| parent | 16c338caebd10216b7e8a585020e01be00b1b28e (diff) | |
| parent | 81338e61422cba74caa584c410a51eb8300bdb4d (diff) | |
| download | game_jam49-6b009edae79606cf9714474abf66031e343195aa.tar.gz game_jam49-6b009edae79606cf9714474abf66031e343195aa.zip | |
Merge remote-tracking branch 'mika/ship-development' into mika-assets
Diffstat (limited to '')
| -rw-r--r-- | ship/ship/ship.tscn | 1 | ||||
| -rw-r--r-- | ship/staircase_1/staircase.blend | bin | 4820720 -> 4814696 bytes | |||
| -rw-r--r-- | ship/staircase_1/staircase_1.bin | bin | 12224 -> 12224 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn index ecc6041..8623f68 100644 --- a/ship/ship/ship.tscn +++ b/ship/ship/ship.tscn @@ -663,3 +663,4 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.4283, -51.0714 ) [node name="water_pump" parent="." instance=ExtResource( 22 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.65267, -3.96773, 18.2793 ) + diff --git a/ship/staircase_1/staircase.blend b/ship/staircase_1/staircase.blend Binary files differindex 5229e83..b469076 100644 --- a/ship/staircase_1/staircase.blend +++ b/ship/staircase_1/staircase.blend diff --git a/ship/staircase_1/staircase_1.bin b/ship/staircase_1/staircase_1.bin Binary files differindex b6b08b7..9d819d1 100644 --- a/ship/staircase_1/staircase_1.bin +++ b/ship/staircase_1/staircase_1.bin |