654 commits

Author	SHA1	Message	Date
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	1846ead27c	Merge branch 'master' into vs2015	2015-06-10 10:11:58 -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
Brad Davis	a483dd27ba	Trying to get widgets / windows working	2015-06-01 17:31:18 -07:00
Stephen Birarda	94131908fb	update polyvox for xcode C++11 build	2015-06-01 14:53:11 -07:00
Brad Davis	912c003d58	Making (most) plugins into a library	2015-05-29 16:49: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	5f12af75bd	Tweaking to match master	2015-05-08 11:11:46 -07:00
Bradley Austin Davis	5e821b4447	Updating plugins	2015-05-07 22:32:28 -07:00
Bradley Austin Davis	77a9f7fa2a	Merge branch 'plugins_pt1' into plugins	2015-05-06 14:22:13 -07:00
Stephen Birarda	b28e7cc765	handle case where a symlink replaces copy	2015-05-04 17:46:03 -07:00
Stephen Birarda	a24789b721	remove extra space from SetupHifiProject	2015-05-01 16:32:05 -07:00
Brad Davis	ba4ae3762d	Working on merging in master	2015-04-30 22:01:03 -07:00
Stephen Birarda	b50545f414	use symlink for DS resources, add AM bandwidth	2015-04-30 13:53:44 -07:00
Stephen Birarda	e8ee9e4b3a	try performing copy in PRE_BUILD for VS	2015-04-30 13:42:30 -07:00
Stephen Birarda	3c7f1cc565	add the symlink or copy directory macro	2015-04-30 13:37:15 -07:00
Stephen Birarda	42c40a7164	attempt add of resources to executable sources	2015-04-30 13:32:25 -07:00
Stephen Birarda	f9ac918ff0	add macro to copy directory beside target	2015-04-30 13:10:59 -07:00
Stephen Birarda	38ae3afc82	add a macro for directory copying	2015-04-30 13:06:00 -07:00
Brad Davis	a83616a7dc	Don't prevent building on Visual Studio 2015	2015-04-30 10:32:19 -07:00