Commit Graph

37 Commits

Author SHA1 Message Date
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 ade1472080 Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-26 22:33:36 +02:00
ViktorLjung 1087f5faa3 More furniture prefabs 2016-05-26 22:33:25 +02:00
William Moberg 72a91d052e Added GetDirectionAtDistance for the bézier curve. 2016-05-26 19:06:28 +02:00
Jace c060eea6bb Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-26 16:11:40 +02:00
Jace c2e8ef71e7 WIP furniture picking 2016-05-26 16:11:13 +02:00
William Moberg 3fe130adba Merge branch 'master' of https://github.com/teamfisk/VstyleR 2016-05-26 15:16:45 +02:00
William Moberg abffff6482 Points uniformly spread on bézier curve should be functional. 2016-05-26 15:16:23 +02:00
ViktorLjung 456680584f Fixed the room a bit 2016-05-25 22:52:07 +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 8b70a93eb1 Merge branch 'master' of github.com:teamfisk/VstyleR
Conflicts:
	Assets/Door.FBX.meta
2016-05-25 20:44:35 +02:00
Jace dbfc1ee1ea Shitty room 2016-05-25 20:44:04 +02:00
ViktorLjung 6327384ed6 Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-25 20:37:52 +02:00
ViktorLjung 1dc3bf63b1 Measurement script that takes a StartPosition and an EndPosition 2016-05-25 20:37:37 +02:00
Jace 55dec17aaa Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-25 19:55:30 +02:00
Jace a1f50e964e Failed attempt at making uniform speed splines 2016-05-25 19:55:09 +02:00
Jace f44d87f51d Rough warehouse browsing by grabbing warehouse items with trigger 2016-05-24 00:41:58 +02:00
Jace 79a7a0b811 Added WarehouseItem script to furniture prefabs 2016-05-24 00:41:31 +02:00
ViktorLjung c04d6176e1 Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-23 23:36:20 +02:00
ViktorLjung 1255fe8244 Window and door assets 2016-05-23 23:36:04 +02:00
Jace 9f945f7b2a Split controller prefab into left and right 2016-05-23 22:58:25 +02:00
ViktorLjung 81dd43a4ce Merge branch 'master' of github.com:teamfisk/VstyleR 2016-05-23 22:49:51 +02:00
ViktorLjung 96acdc206b LaserPointer base 2016-05-23 22:49:40 +02:00
Jace 377ecb491f Super cool skybox 2016-05-23 21:17:59 +02:00
Jace 116aeab50a Semi-proper warehouse scrolling using bezier curves 2016-05-23 21:17:41 +02:00
Jace 6a84d7c777 Furniture prefabs 2016-05-23 21:17:09 +02:00
Jace 6a21aa1ea6 Fonts with a shader that has depth 2016-05-23 21:16:31 +02:00
Jace 3ed120f4a3 Squid, dildos and bezier curves 2016-05-21 18:28:41 +02:00
ViktorLjung ef12b2fbf0 Squid assets 2016-05-19 16:07:29 +02:00
Jace cdf40b852e Semi-working fade into warehouse by trigger press 2016-05-19 00:35:30 +02:00
Jace ce46120e5a Actual project things 2016-05-18 20:02:27 +02:00
Jace 1e9b3a1498 SteamVR 2016-05-18 20:02:15 +02:00
Jace 62c8cf021f Asset packs 2016-05-18 20:01:18 +02:00
Jace 90f179431d Unity gitignore 2016-05-18 19:58:42 +02:00