diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-08-23 06:52:42 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-08-23 06:52:42 +0900 |
| commit | ad70b50fee69f4d266bc915fcda4007b57b7f57c (patch) | |
| tree | 4e7f5c0e82e541f960cea06c75568f584b4ef36d /src/client | |
| parent | Update README.md [AUTOGEN] (#5335) (diff) | |
| download | sharkey-ad70b50fee69f4d266bc915fcda4007b57b7f57c.tar.gz sharkey-ad70b50fee69f4d266bc915fcda4007b57b7f57c.tar.bz2 sharkey-ad70b50fee69f4d266bc915fcda4007b57b7f57c.zip | |
[Room] Add energy drink
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/scripts/room/furnitures.json5 | 4 | ||||
| -rw-r--r-- | src/client/assets/room/furnitures/energy-drink/energy-drink.blend | bin | 0 -> 724764 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/energy-drink/energy-drink.glb | bin | 0 -> 145836 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/energy-drink/texture.afdesign | bin | 0 -> 824566 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/energy-drink/texture.png | bin | 0 -> 127510 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/energy-drink/uv.png | bin | 0 -> 22142 bytes |
6 files changed, 4 insertions, 0 deletions
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5 index b6ddd5c2b8..b469ff5a82 100644 --- a/src/client/app/common/scripts/room/furnitures.json5 +++ b/src/client/app/common/scripts/room/furnitures.json5 @@ -381,5 +381,9 @@ }, }, }, + }, + { + id: 'energy-drink', + place: "floor", } ] diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend Binary files differnew file mode 100644 index 0000000000..65fc41273e --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb Binary files differnew file mode 100644 index 0000000000..7fb1c27836 --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign Binary files differnew file mode 100644 index 0000000000..8c117a49b1 --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/texture.afdesign diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png Binary files differnew file mode 100644 index 0000000000..484ca0f96f --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/texture.png diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png Binary files differnew file mode 100644 index 0000000000..2a3f20c999 --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/uv.png |
