161 commits

Author	SHA1	Message	Date
Brad Davis	9f98547390	Merge branch 'master' into plugins	2015-06-22 13:35:40 -07:00
Brad Davis	a8d3dc7218	Updating oglplus version	2015-06-17 23:50:38 -07:00
Brad Davis	4f8ea3f624	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-16 09:58:20 -07:00
Brad Davis	15d214f335	Initial pass at OpenVR	2015-06-12 17:29:05 -07:00
Brad Davis	7955eeda28	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.h	2015-06-12 15:49:35 -07:00
Stephen Birarda	128b086e82	don't build the polyvox examples	2015-06-12 10:25:34 -07:00
Brad Davis	e9587d90c4	Trying to fix linux build	2015-06-09 01:50:32 -07:00
Brad Davis	43bddf23b4	Grabbing correct oglplus commit	2015-06-09 01:03:14 -07:00
Brad Davis	5a1b713160	Fixing texture include error in oglplus	2015-06-09 00:59:17 -07:00
Brad Davis	11bc838be9	Switching to Git for oglplus	2015-06-09 00:48:42 -07:00
Brad Davis	119f37a178	Working on SDK 0.6	2015-06-07 14:34:40 -07:00
Brad Davis	f614268667	Moving windows to SDK 0.6 ... Working on SDK 0.6 for windows Working on SDK 0.6 for windows	2015-06-07 01:40:44 -07:00
Brad Davis	f22682fe39	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h	2015-06-01 22:59:10 -07:00
Stephen Birarda	94131908fb	update polyvox for xcode C++11 build	2015-06-01 14:53:11 -07:00
Brad Davis	8bad80324f	Merge branch 'master' into plugins_pt3	2015-05-29 09:05:01 -07:00
Brad Davis	1c49dde6f8	Merge branch 'master' into plugins ... Conflicts: CMakeLists.txt	2015-05-28 14:30:19 -07:00
Seth Alves	aefd34f8d6	trying again to get polyvox to build on osx	2015-05-28 06:43:31 -07:00
Seth Alves	24bb17f7b2	trying again to get polyvox to build on osx	2015-05-28 06:36:31 -07:00
Seth Alves	b024bd0ff2	trying again to get polyvox to build on osx	2015-05-27 22:00:20 -07:00
Seth Alves	6a1ea820e7	trying again to get polyvox to build on osx	2015-05-27 21:50:35 -07:00
Seth Alves	1026da18b2	trying again to get polyvox to build on osx	2015-05-27 21:32:20 -07:00
Seth Alves	5b62714ba4	trying again to get polyvox to build on osx	2015-05-27 21:09:48 -07:00
Seth Alves	5e79b03faf	trying to get polyvox to build on osx	2015-05-27 20:55:16 -07:00
Seth Alves	f4b7a41006	trying to get polyvox to build on osx	2015-05-27 20:46:50 -07:00
Seth Alves	6711c64cc6	trying to get polyvox to build on osx	2015-05-27 20:20:37 -07:00
Seth Alves	00296faa51	trying to get polyvox to build on osx	2015-05-27 20:00:37 -07:00
Seth Alves	aff82a90ce	try, try again	2015-05-27 19:16:50 -07:00
Seth Alves	05cd7fb8c4	update polyvox external source	2015-05-27 18:39:13 -07:00
Seth Alves	25df777132	fix polyfox url	2015-05-27 16:15:58 -07:00
Seth Alves	c933c42b18	move polyvox external source to s3	2015-05-27 15:02:20 -07:00
Seth Alves	1109444c3d	attempt to make sure the ray that picks against polyvox entities is long enough	2015-05-27 14:57:12 -07:00
Brad Davis	810db39233	Working on oculus rendering	2015-05-27 12:42:05 -07:00
Seth Alves	7c4b89d917	get polyvox to build on osx	2015-05-27 11:56:57 -07:00
Brad Davis	09085f1cd9	Working towards display plugins	2015-05-26 18:42:38 -07:00
Brad Davis	e69362dadc	Working on stereo rendering	2015-05-22 17:51:59 -07:00
Brad Davis	ac93d2c721	Working on display plugins	2015-05-21 18:50:11 -07:00
Seth Alves	6a3203475a	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-21 11:57:54 -07:00
Seth Alves	0c1ad258f3	update polyvox	2015-05-21 11:57:37 -07:00
Seth Alves	bd94d28075	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-21 11:55:17 -07:00
Seth Alves	8e76887101	working on windows build of polyvox	2015-05-21 11:55:13 -07:00
Seth Alves	b74262f2ce	update polyvox	2015-05-21 11:53:56 -07:00
Seth Alves	c02b87ad1c	update polyvox	2015-05-21 11:09:44 -07:00
Seth Alves	4166c3224f	link polyvox library in with entities	2015-05-19 16:24:13 -07:00
Bradley Austin Davis	03bd17ed49	Rebasing onto scale changes	2015-05-08 15:09:46 -07:00
Bradley Austin Davis	5e821b4447	Updating plugins	2015-05-07 22:32:28 -07:00
Brad Davis	ba4ae3762d	Working on merging in master	2015-04-30 22:01:03 -07:00
Stephen Birarda	b25d22aa53	use debug/release for IDE handling of V-HACD	2015-04-15 14:38:24 -07:00
Stephen Birarda	03129f98d4	make VHACD an external project	2015-04-15 13:51:51 -07:00
Clément Brisset	01dc1b058c	Merge pull request #4580 from birarda/master ... use non-persistent settings to avoid lobby crash confusion	2015-04-02 17:37:24 +02:00
Bradley Austin Davis	4a7fd318c3	Fixing build problem on linux	2015-04-01 18:45:50 -07:00