 Tleety
|
b840315f73
|
Merge remote-tracking branch 'origin/master' into Templates
Conflicts:
Assets/Door.FBX.meta
Assets/DoorFrame.FBX.meta
Assets/Materials/M_Door.mat
Assets/Materials/M_Door.mat.meta
Assets/Materials/M_Frame.mat
Assets/Materials/M_Frame.mat.meta
Assets/Materials/M_Glass.mat
Assets/Materials/M_Glass.mat.meta
Assets/WindowFrame.FBX.meta
|
2016-05-25 23:42:24 +02:00 |
|
|
Tleety
|
6bd8afd3e7
|
Outline for selected objects
|
2016-05-25 23:39:41 +02:00 |
|
 ViktorLjung
|
b85d89fbb6
|
New room model
|
2016-05-25 22:42:48 +02:00 |
|
|
ViktorLjung
|
fc764b4ec2
|
More Furnitures
|
2016-05-25 21:09:49 +02:00 |
|
 Jace
|
dbfc1ee1ea
|
Shitty room
|
2016-05-25 20:44:04 +02:00 |
|
|
Jace
|
3ed120f4a3
|
Squid, dildos and bezier curves
|
2016-05-21 18:28:41 +02:00 |
|
|
Jace
|
ce46120e5a
|
Actual project things
|
2016-05-18 20:02:27 +02:00 |
|