Merge branch 'Environment-Appartment' into dev

# Conflicts:
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/fishtank_glass.uasset
#	EndlessVendetta/Content/Levels/Apartment_hit.umap
This commit is contained in:
Rafal Swierczek 2024-05-04 12:36:37 +01:00
commit 4ca835b4c0
131 changed files with 393 additions and 0 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43bb54782433f2322d2a4899b185da92ec435fde6e84607242a48b89856c7f9b
size 76532

BIN
James WARD Art/Character/Robot drone characters.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/Character/Robot drone characters2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/Environment/Window1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/Environment/Window2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BAR 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BAR 2.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/BM SYMBOL 1.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/BM SYMBOL 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/CROSS 1.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/CROSS 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/CROSS 2.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/CROSS 2.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK 1.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK 2.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK BOX 1.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK BOX 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK BOX 2.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/BUTTONS/TICK BOX 2.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/ENDLESS FONT BLACK 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/ENDLESS FONT WHITE 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/LARGE BOX 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/SLIDER BAR 1.1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/SLIDER BAR 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/SLIDER TAB.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/BACK 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/BACK 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/BLACK MARKET 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/BLACK MARKET 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/BUY 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/BUY 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/EXIT 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/EXIT 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/GADGETS 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/GADGETS 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/MENU 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/MENU 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/MODS 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/MODS 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/OK 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/OK 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/OPTIONS 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/OPTIONS 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/QUIT 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/QUIT 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/SETTINGS 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/SETTINGS 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/SKIP 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/SKIP 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/SOUND 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/SOUND 2.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/START 1.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
James WARD Art/INDIVIDUAL UI ASSETS/TEXT/START 2.png (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More