659 commits

Author	SHA1	Message	Date
Brad Davis	0a389a9daa	Updating oglplus version and switching to url based dist	2015-07-07 11:11:52 -07:00
Seiji Emery	16e7af1848	Reverted macro naming convention	2015-07-02 17:41:38 -07:00
Seiji Emery	a48adf5ce5	Cleanup + formatting	2015-06-30 14:12:58 -07:00
Seiji Emery	e81b0a3c3a	Fixed tests for ALL_BUILD ... Fixed physics tests, disabled out-of-date octree tests, and renamed / added QTestExtensions to the tests folder (IDE view). ALL_BUILD will now succeed.	2015-06-26 13:31:31 -07:00
Seiji Emery	6e87f44ec7	Merge remote-tracking branch 'upstream/master'	2015-06-24 15:12:57 -07:00
Seiji Emery	0ee0c92f2f	Re-added stuff	2015-06-24 14:54:54 -07:00
Andrew Meadows	1ceed98ca2	Merge pull request #5166 from jherico/64bit ... Enable Windows 64 bit builds	2015-06-23 17:03:42 -07:00
Seiji Emery	0cc940d433	Modified the build files for external targets so that they longer show up project view in IDEs (which clutters up the view, etc). ... Said files are now buried under hidden/externals; the (phony) build targets still exist and are visible in the target dropdown, but this is filterable (in Xcode, dunno about Visual Studio (just start typing and a filter/search box comes up))	2015-06-19 21:58:16 -07:00
Brad Davis	d65e5882aa	Working on 64 bit builds	2015-06-18 21:44:12 -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
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	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
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
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
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
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
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
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