12 Commits

Author SHA1 Message Date
Jace 3ed5cd974a VstyleR, rackamackafån 2016-05-27 06:16:43 +02:00
Jace e1e408580a Merge commit '6bd8afd3e7588e6c4e249821acea0fcf97f7d46d'
# 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-26 23:54:07 +02:00
Jace a173e5741f Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-26 22:56:24 +02:00
Jace 9c68c18384 Trying to figure stuff out 2016-05-26 22:56:11 +02:00
ViktorLjung ace70b339d Measurement.prefab added 2016-05-26 22:51:24 +02:00
ViktorLjung 1087f5faa3 More furniture prefabs 2016-05-26 22:33:25 +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