61976 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	9ad27e93f5	Merge pull request #11820 from ElderOrb/FB9264 ... 9264 dismiss keyboard after user finished typing in marketplace searc…	2017-11-15 14:56:00 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
David Kelly	009e6b252a	Merge pull request #11814 from AndrewMeadows/fix-cylinders ... fix cylinder collision shape	2017-11-15 15:24:29 -07:00
Zach Fox	9f80a5f081	Merge pull request #11817 from zfox23/commerce_rezFix ... Fix rezzing non-JSON marketplace items	2017-11-15 14:17:05 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
luiscuenca	bf0d55aa98	9267 Fix not restoring animations after changing view modes	2017-11-15 15:04:24 -07:00
Dante Ruiz	9564b7567b	fixing tablet in 3d person	2017-11-15 13:39:21 -08:00
David Back	e0ce154472	remove includes, fix comment	2017-11-15 13:37:15 -08:00
Dante Ruiz	b42704012e	Merge pull request #11819 from hyperlogic/bug-fix/avatar-eye-height ... Bug fix for MyAvatar.getEyeHeight()	2017-11-15 13:20:30 -08:00
Alexander Ivash	78d89d886f	9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key	2017-11-16 00:13:46 +03:00
John Conklin II	703d1e1739	Merge pull request #11808 from Atlante45/hazeUIFix ... RC-59 patch - Removed Keylight attenuation from .js (as well as .html).	2017-11-15 12:54:14 -08:00
David Back	0b8f888d9b	Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3	2017-11-15 12:50:03 -08:00
David Back	fee7701890	working mirror projection for secondary camera	2017-11-15 12:49:39 -08:00
Anthony J. Thibault	b49891c0f8	Bug fix for MyAvatar.getEyeHeight()	2017-11-15 11:27:42 -08:00
Zach Fox	e8c4878c8f	Fix rezzing non-JSON marketplace items	2017-11-15 11:25:18 -08:00
Atlante45	d8b1cb10df	CR	2017-11-15 11:20:30 -08:00
Atlante45	e68ce97697	Remove the number of socket change tracking	2017-11-15 11:19:54 -08:00
Dante Ruiz	d83f3152dd	Merge pull request #11809 from ElderOrb/FB8984 ... 8984 Opening tablet with "Enter" key displays the audio menu	2017-11-15 11:16:49 -08:00
Dante Ruiz	b633968865	fix-bringing-up-logs	2017-11-15 10:47:06 -08:00
Elisa Lupin-Jimenez	797016f497	changed url for blocks app	2017-11-15 10:12:13 -08:00
Sam Gateau	2c51e516eb	Merge pull request #11744 from Zvork/shadow ... Shadow caster culling fix	2017-11-15 09:49:39 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
Andrew Meadows	d538a9aaa8	fix typo making cylinders collide as sphere	2017-11-15 09:04:04 -08:00
Olivier Prat	14275b1cf3	Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded	2017-11-15 15:42:04 +01:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Olivier Prat	bf46ccefaf	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-15 08:59:36 +01:00
Andrew Meadows	2f5b7f32c6	only add valid renderables to _renderablesToUpdate	2017-11-14 17:08:12 -08:00
Stephen Birarda	557ee458ec	wait for node active socket before constructing packets	2017-11-14 17:08:01 -08:00
Howard Stearns	1c293c4c48	Merge pull request #11813 from zfox23/commerce_removeEditJSDependency ... Remove Marketplace's dependency on Edit.js for REZ/WEAR	2017-11-14 16:33:35 -08:00
nissim.hadar	df614f3a9e	Merge branch 'autoTester' of https://github.com/NissimHadar/hifi into autoTester	2017-11-14 16:20:05 -08:00
nissim.hadar	4bfa795e31	Merge branch 'master' into autoTester	2017-11-14 16:00:18 -08:00
Andrew Meadows	500f381827	collect hard-coded time budgets in one spot	2017-11-14 15:57:17 -08:00
Andrew Meadows	ffe16a754e	another pass through the crucible	2017-11-14 15:57:17 -08:00
Andrew Meadows	f67114a0a8	PrioritySortUtil::Prioritizer doesn't need to be a template	2017-11-14 15:57:17 -08:00
Andrew Meadows	55cc945c78	organize PrioritySortUtil differently	2017-11-14 15:57:17 -08:00
Andrew Meadows	99b4283cbc	fix typo in 'out-of-view' check	2017-11-14 15:57:17 -08:00
Andrew Meadows	d7b84f8a86	fix typo in comment	2017-11-14 15:57:17 -08:00
Andrew Meadows	111480f630	fix bad conflict resolution	2017-11-14 15:57:17 -08:00
Andrew Meadows	e93c10b5ee	remove cruft	2017-11-14 15:57:17 -08:00
Andrew Meadows	8707c76a6a	templatize the ViewFrustum-relative sort algorithm	2017-11-14 15:57:17 -08:00
Andrew Meadows	f47185b2f6	remove tabs from indentation	2017-11-14 15:57:17 -08:00
Andrew Meadows	c6bccb3de3	avoid adding null renderables to list	2017-11-14 15:57:17 -08:00
Andrew Meadows	809ff7928e	sort and throttle UpdateRenderables	2017-11-14 15:57:17 -08:00
Andrew Meadows	5050a554a2	remove warning about signed/unsigned comparison	2017-11-14 15:57:17 -08:00
Zach Fox	d6c244d1d5	Remove incorrect logic	2017-11-14 14:54:03 -08:00
Ken Cooke	9810d1582d	CR fixes	2017-11-14 14:36:37 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Dante Ruiz	dd043d42c4	fixing merge conflict	2017-11-14 14:21:48 -08:00
SamGondelman	789b06cb9f	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup	2017-11-14 14:17:46 -08:00
Dante Ruiz	558a34d7b8	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-14 14:09:29 -08:00