28963 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bradley Austin Davis	a93e17d622	Fix domain connection status border	2015-07-22 08:27:51 -04:00
Bradley Austin Davis	9596452c32	Trying to fix oculus rendering	2015-07-22 08:07:44 -04:00
Bradley Austin Davis	ae539afafb	Fix deadlock when using textoverlay from main thread	2015-07-22 07:23:12 -04:00
Thijs Wenker	00fbe17b3c	Merge branch 'master' of https://github.com/worklist/hifi into 20552	2015-07-22 10:21:47 +02:00
Thijs Wenker	de116c4e3b	editMode on and off switch by clicking the COG, proper removal of planks when rows/columns removed	2015-07-22 10:21:13 +02:00
David Rowe	87dbbdb2e8	Set an initial alpha in anticipation of sphere alpha working	2015-07-21 18:25:35 -07:00
David Rowe	55683e0cd5	Size looking-at-me eye spheres per avatar model dimensions	2015-07-21 18:24:47 -07:00
David Rowe	bed266dfe9	Fade looking-at-me eye spheres over half a second	2015-07-21 18:23:50 -07:00
David Rowe	9ac4e2f687	Render spheres over avatar eyes if they're looking at me	2015-07-21 18:22:27 -07:00
Bradley Austin Davis	bd5da87551	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 19:23:38 -04:00
Bradley Austin Davis	d6994c6dfd	Restoring star size and color variation	2015-07-21 19:22:10 -04:00
Bradley Austin Davis	c3f77a1c24	Merge branch 'master' into maggie	2015-07-21 19:21:45 -04:00
Kevin M. Thomas	ebe61b8c09	Merge branch 'master' of https://github.com/highfidelity/hifi into 20628	2015-07-21 18:15:19 -04:00
Kevin M. Thomas	75fa789b79	Changeable zone var declaration.	2015-07-21 18:13:26 -04:00
Kevin M. Thomas	cd58dc11ce	Initial file placement into job.	2015-07-21 18:10:13 -04:00
Brad Hefta-Gaub	6dbe6bc375	Merge pull request #5332 from ctrlaltdavid/20612 ... Fix full-screen mirror not mirroring correctly with Faceshift or DDE	2015-07-21 13:32:56 -07:00
Andrew Meadows	d6aa6b930b	Merge pull request #5368 from bwent/keyLightDirectionFix ... Add Vec3 function to convert a Vec3 to/from Euler angles	2015-07-21 13:31:28 -07:00
bwent	5a8106a049	fixes in edit.js UI	2015-07-21 13:15:24 -07:00
Philip Rosedale	6c51c9e950	added ability to follow/fly with the birds	2015-07-21 12:18:52 -07:00
Niraj Venkat	e0634de403	Turn on/off debug AO from menu item	2015-07-21 12:14:09 -07:00
bwent	2b745395ec	use radius for z-component	2015-07-21 11:38:10 -07:00
Sam Gateau	7b35048e52	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-21 11:18:15 -07:00
Sam Gateau	93afdf79a3	Removing the gl driver version report intiialization code out of applciation	2015-07-21 11:17:41 -07:00
bwent	d688e5f915	fix case where v not normalizable	2015-07-21 11:08:53 -07:00
bwent	30d4b9f635	switch to radians, overload fromPolar, use atan2	2015-07-21 11:08:53 -07:00
bwent	89eed589e2	Add Vec3 function to convert vec3 to/from euler angles	2015-07-21 11:08:53 -07:00
Philip Rosedale	cf88bce082	Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering ... Fix Avatar > Blue Sphere While Speaking not rendering	2015-07-21 09:11:36 -07:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers ... Smart pointers fixes	2015-07-21 08:52:29 -07:00
Brad Davis	5b63863dca	Merge pull request #5378 from ZappoMan/warningFixes ... coding standard fix	2015-07-21 08:52:17 -07:00
David Rowe	716211c6b7	Merge branch 'master' into fix-speech-bubble-not-rendering	2015-07-21 08:45:13 -07:00
ZappoMan	558f10640b	coding standard fix	2015-07-21 08:30:33 -07:00
Thijs Wenker	5d74858500	edit.js - entityList - delete key deletes entities, hold shift to select a group of entities, moved appending single entity to selection to ctrl key	2015-07-21 17:01:54 +02:00
Thijs Wenker	0d0f12164a	planky, enabling properties button	2015-07-21 16:57:02 +02:00
Brad Davis	6d4c7cd4f2	Merge pull request #5374 from ZappoMan/warningFixes ... Warning fixes and removing dead code	2015-07-21 07:23:40 -07:00
Brad Davis	57f9abe5c8	Merge pull request #5377 from samcake/punk ... Removing extra gl calls and removing cruff from Application.cpp	2015-07-21 06:28:27 -07:00
Brad Davis	51973674f5	Merge remote-tracking branch 'upstream/master' into marge	2015-07-20 17:26:36 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
David Rowe	ac4b64c853	Merge branch 'master' into 20602	2015-07-20 17:14:52 -07:00
Sam Gateau	5bf85961d2	removing dead code	2015-07-20 17:13:02 -07:00
Sam Gateau	ad1771c738	removing dead code	2015-07-20 17:09:11 -07:00
Brad Davis	94d57a2e43	fixing missing glew init	2015-07-20 16:51:01 -07:00
Sam Gateau	9d9142c274	cleaning commented code supposedly dead now	2015-07-20 16:50:24 -07:00
Niraj Venkat	075c9f05de	Introducing blend stage in the AO pipeline	2015-07-20 16:34:02 -07:00
Sam Gateau	6a0ca6e113	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-20 16:22:12 -07:00
samcake	e63d122f2a	Merge pull request #5375 from birarda/protocol ... repairs to early return for sendNackPackets	2015-07-20 16:21:55 -07:00
Stephen Birarda	9fb8b55359	repairs to early return for sendNackPackets	2015-07-20 16:10:11 -07:00
ZappoMan	65a79cfefb	fix a bunch of warnings	2015-07-20 15:58:25 -07:00
Sam Gateau	b5090883a0	merge with latest network pr	2015-07-20 15:49:10 -07:00
David Rowe	a488a12151	Merge branch 'master' into 20602	2015-07-20 15:37:43 -07:00