12821 commits

Author	SHA1	Message	Date
ZappoMan	23b89a6f7d	remove naked gl/dead code from line and cube overlays	2015-07-14 17:04:07 -07:00
Philip Rosedale	17ec524253	Merge pull request #5324 from ZappoMan/fixLaggingTouch ... fix lagging touch events	2015-07-14 16:28:00 -07:00
ZappoMan	68f4fe6566	fix lagging touch events	2015-07-14 16:03:44 -07:00
Philip Rosedale	221a92eeee	Merge pull request #5322 from ctrlaltdavid/fix-eye-direction ... Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 15:38:56 -07:00
David Rowe	bfad3ee02a	Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 14:07:32 -07:00
Atlante45	a32f54da2f	Cleanup	2015-07-14 12:36:18 -07:00
Atlante45	7bf45308b6	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-14 12:31:37 -07:00
Brad Hefta-Gaub	049419cec7	Merge pull request #5307 from howard-stearns/remove-octreeFades ... Remove old octreeFade code that wasn't working anyway	2015-07-14 10:24:01 -07:00
Brad Davis	684d466b44	Merge pull request #5308 from venkatn93/avatar ... Avatars rendered correctly based on Scene.shouldRenderAvatars	2015-07-14 09:06:49 -07:00
Niraj Venkat	ef3c6b25e0	More coding standard changes	2015-07-14 00:45:38 -07:00
Niraj Venkat	1f1a5f8e75	Coding standard and fixing pointers	2015-07-13 22:57:11 -07:00
Philip Rosedale	c81053fc83	Merge pull request #5318 from samcake/punk ... Fixing the ImageOverlay Bug	2015-07-13 22:25:46 -07:00
Clément Brisset	a432752c39	Merge pull request #5316 from ctrlaltdavid/20604 ... QA for #20604 - Add an "is looking at me" indicator above avatars' heads	2015-07-13 16:40:11 -07:00
Sam Gateau	f08c608195	Remove dead code	2015-07-13 16:33:04 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
Sam Gateau	4743bbad80	Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js	2015-07-13 16:18:39 -07:00
Clément Brisset	c99382ee74	Merge pull request #5287 from ctrlaltdavid/20607 ... CR for Job #20607 - Interface upgrade message has bad formatting	2015-07-13 16:07:17 -07:00
Clément Brisset	24eb4c8263	Merge pull request #5309 from sethalves/quiet-compiler ... quiet compiler	2015-07-13 15:55:35 -07:00
Niraj Venkat	10e0a93ac0	Fix for avatar rendering not working on domain exit/entry	2015-07-13 15:22:00 -07:00
David Rowe	59f456a2f2	Add an "is looking at me" indicator above avatars' heads ... Menu item: Developer > Avatar > Show Who's Looking at Me	2015-07-13 14:16:39 -07:00
Howard Stearns	d1952583ab	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades	2015-07-13 07:24:08 -07:00
Seth Alves	fb23eb0faf	Merge pull request #5301 from samcake/yellow ... Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture	2015-07-12 11:36:03 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Niraj Venkat	f95bd3f7bd	Fixing build error	2015-07-10 17:46:20 -07:00
Niraj Venkat	bbd7b2a65e	Removed unused functions	2015-07-10 17:31:49 -07:00
Niraj Venkat	dacc6f66c0	Avatars rendered correctly based on Scene.shouldRenderAvatars	2015-07-10 17:26:56 -07:00
Howard Stearns	51be245159	Remove old octreeFade code that wasn't working anyway.	2015-07-10 16:55:45 -07:00
Atlante45	ec7e1df8c0	Move and rename menu item	2015-07-10 15:47:46 -07:00
Atlante45	a3848f08d2	Conditionnal fixes.	2015-07-10 15:36:17 -07:00
Sam Gateau	98f10e72ec	fix the wrong function name that happened missing a merge	2015-07-10 15:20:49 -07:00
Andrew Meadows	9cb7e86877	cleanup of AvatarActionHold deserialization	2015-07-10 12:34:12 -07:00
Atlante45	5cfa1605df	Made Texture safe with resource refresh	2015-07-10 12:28:06 -07:00
Sam Gateau	2c05349b06	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
Sam Gateau	7fc9fd97ff	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
Atlante45	4702b39130	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-10 10:56:11 -07:00
Andrew Meadows	1759f0553d	Merge pull request #5290 from BingShearer/CrashFixes ... Crash fixes	2015-07-10 10:42:47 -07:00
Brad Hefta-Gaub	33016e2797	Merge pull request #5293 from jherico/bart ... More profiling ranges and updated performance testing scripts	2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub	af20969eb9	Merge pull request #5298 from jherico/lisa ... Restore audio scope	2015-07-09 19:03:29 -07:00
Brad Hefta-Gaub	74ef91550c	Merge pull request #5296 from venkatn93/master ... Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 18:54:06 -07:00
Brad Davis	a92a7980d7	Restore audio scope	2015-07-09 17:49:25 -07:00
Andrew Meadows	270ea7af9e	Merge pull request #5292 from sethalves/palm-rotation ... action changes to allow "hold" action to track palm rotation	2015-07-09 17:44:28 -07:00
Niraj Venkat	007d662db1	Re-added for shouldRenderEntities	2015-07-09 17:40:14 -07:00
Niraj Venkat	706f85e4ce	Fixes to comply with coding standard	2015-07-09 17:31:38 -07:00
Seth Alves	d0d0b2a143	Merge pull request #5295 from birarda/master ... potential fix for windows domain connect cycling	2015-07-09 17:04:06 -07:00
Atlante45	bfeb095fb4	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-09 16:30:56 -07:00
Niraj Venkat	adf5b95835	Changing formatting	2015-07-09 16:25:29 -07:00
Niraj Venkat	52095fd38d	Fixing merge	2015-07-09 16:23:40 -07:00
Niraj Venkat	1dce5f80cc	Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 16:17:58 -07:00
Brad Davis	214405a0e5	Fixing typo	2015-07-09 16:06:27 -07:00