59628 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
Zach Fox	1d1b846f39	Better 'view backup instructions' behavior	2017-10-02 12:44:51 -07:00
Zach Fox	1050d2851d	Modify injected code to add to dropdown menu	2017-10-02 12:37:49 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Zach Fox	2b03e08c96	Fix errant status when requesting it for the first time	2017-10-02 10:20:24 -07:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
Zach Fox	2783293d24	Merge pull request #11490 from vladest/fix_walletsetup_focus ... Remove mouse area for text fields. use activeFocusOnPress property in…	2017-10-02 08:38:04 -07:00
Seth Alves	0d010d0cf4	Merge pull request #11493 from hyperlogic/bug-fix/oculus-controller-rendering ... Bug fix for offset of animated parts of oculus touch controller display	2017-10-01 16:54:05 -07:00
Sam Gateau	59225ae8ac	Merge pull request #11497 from SamGondelman/modelOverlays ... Fix ModelOverlay visible change	2017-10-01 12:56:27 -07:00
vladest	9a00468ea9	semicolons, yes	2017-10-01 19:21:30 +02:00
vladest	feafd441b1	Make sure keyboard will be rised after lowering on another click	2017-10-01 18:54:07 +02:00
vladest	c3bc67b72d	Merge branch 'master' into fix_walletsetup_focus	2017-10-01 18:24:38 +02:00
SamGondelman	0bb27a7165	fix modeloverlay visible change	2017-09-29 17:48:59 -07:00
Zach Fox	1e52e7824b	Fix injection	2017-09-29 16:39:07 -07:00
Zach Fox	255cede808	Correctly determine if we're on a marketplace screen	2017-09-29 16:05:26 -07:00
Zach Fox	e6ea76eefe	Tiny language fix - Thanks Cain!	2017-09-29 15:44:44 -07:00
Zach Fox	4668294389	Fix login flow regression	2017-09-29 15:25:24 -07:00
Zach Fox	bbbce96407	Fix gray securityimage	2017-09-29 14:30:02 -07:00
Anthony J. Thibault	9273e02497	Bug fix for offset of animated parts of oculus touch controller display ... Ensure position/rotations are updated with a consistent scale and are animated correctly as the controller values change.	2017-09-29 14:01:50 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
Sam Gateau	fb5fd346ff	Merge pull request #11492 from SamGondelman/tPose ... Fix getting stuck in T-Pose on avatar switch	2017-09-29 13:37:31 -07:00
Sam Gateau	332fb86a9f	Merge pull request #11141 from AndrewMeadows/prioritized-entity-streaming ... entity-server uses differential Octree traversal and priority-queued EntityItems	2017-09-29 13:34:58 -07:00
vladest	7f6773b1f4	Added semicolons	2017-09-29 21:12:21 +02:00
Andrew Meadows	ad9a239b45	remove unused cruft	2017-09-29 11:34:36 -07:00
Andrew Meadows	8134e2b7f9	fix const violation	2017-09-29 11:34:36 -07:00
Andrew Meadows	86cbea73c8	less magic	2017-09-29 11:34:36 -07:00
Andrew Meadows	01304de8c2	indent switch statement, use const ref	2017-09-29 11:34:36 -07:00
Andrew Meadows	32910e6f40	use [this] for lambda capture list	2017-09-29 11:34:35 -07:00
Andrew Meadows	f5f1a64c92	use const ref on pointer, and use dynamic_cast	2017-09-29 11:34:35 -07:00
Andrew Meadows	b16d666026	remove dupe addToNeedsParentFixupList() call	2017-09-29 11:34:35 -07:00
Andrew Meadows	0c934e863b	clarify some comments	2017-09-29 11:34:35 -07:00
Andrew Meadows	5dcd6bc496	namechange: apparentAngle --> angularDiameter	2017-09-29 11:34:35 -07:00
Andrew Meadows	1c30f7424e	remove cruft and add comments	2017-09-29 11:34:35 -07:00
SamGondelman	3ae41b9b75	cleanup client and stats string	2017-09-29 11:34:35 -07:00
SamGondelman	f7af581c71	track traversal time, rename entity server stat	2017-09-29 11:34:35 -07:00
Andrew Meadows	a56c076149	fix bad resolution during rebase	2017-09-29 11:34:35 -07:00
Andrew Meadows	99265a5758	remove extra parens	2017-09-29 11:34:35 -07:00
Andrew Meadows	25d250898b	remove old debug info	2017-09-29 11:34:35 -07:00
Andrew Meadows	49e11d2173	fix Differential scan logic for LOD culling	2017-09-29 11:34:35 -07:00
SamGondelman	f2de03bc38	small fixes and LOD cull children instead of parent	2017-09-29 11:34:35 -07:00
Andrew Meadows	624d0c12a2	minor cleanup	2017-09-29 11:34:35 -07:00
Andrew Meadows	b1b7764056	use 20 degrees of OVERSEND	2017-09-29 11:34:35 -07:00
SamGondelman	c39ac93fc8	fix isVerySimilar	2017-09-29 11:34:35 -07:00
SamGondelman	cbd20f89dd	separate elementBag logic from EntityTreeSendThread	2017-09-29 11:34:35 -07:00
SamGondelman	bf1065b56e	track encode stats	2017-09-29 11:34:35 -07:00
Andrew Meadows	a0f95ca5bd	swap order of evaluation for minor theoretical speedup	2017-09-29 11:34:35 -07:00
Andrew Meadows	355a59edb1	fix missing entities in differential traversal	2017-09-29 11:34:35 -07:00
Andrew Meadows	d55d45f6aa	check radius in ViewFrustum::isVerySimilar()	2017-09-29 11:34:35 -07:00
Andrew Meadows	a55661e1ff	remove ViewFrustum::calculateProjection()	2017-09-29 11:34:35 -07:00
Andrew Meadows	3433c5c414	remove redundant boolean logic	2017-09-29 11:34:35 -07:00