59638 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nissim Hadar	cdbf067a24	Rename (haze)getParametersBuffer to getHazeParametersBuffer. ... Add corrections from Sam	2017-10-02 16:54:02 -07:00
Nissim Hadar	ca4c5969d9	Clean-up.	2017-10-02 14:36:45 -07:00
Nissim Hadar	1fa7e15132	Added 'HIFI_DISABLE_WATCHDOG' code.	2017-10-02 14:36:26 -07:00
Nissim Hadar	29d5e772d4	Removed "..Is.." from various methods.	2017-10-02 12:42:46 -07:00
Nissim Hadar	93bc3bec52	Removed (unused) _haze.	2017-10-02 12:14:21 -07:00
Nissim Hadar	48fb7522c0	Removed blank line	2017-10-02 11:42:04 -07:00
Nissim Hadar	20a42d6fbd	Fixed model name string	2017-10-02 10:11:34 -07:00
Nissim Hadar	d1488ebfad	Added .qml and .js for debug	2017-10-02 10:10:29 -07:00
Nissim Hadar	5dd4624904	Merge branch 'master' into hazeZone	2017-10-02 09:11:00 -07:00
Nissim Hadar	97756146b1	Attempt to add qml configuration	2017-10-02 09:09:36 -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
Nissim Hadar	bdd469cec4	Integrated haze shader into this branch.	2017-10-01 21:52:34 -07:00
Nissim Hadar	ffecf42ebb	Some clean-up.	2017-10-01 21:12:29 -07:00
Nissim Hadar	449d7ae988	Merge branch 'master' into hazeZone	2017-10-01 19:18:16 -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
Nissim Hadar	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -07:00
Nissim Hadar	95f8f1ffc5	Added Varying8	2017-09-29 18:05:48 -07:00
SamGondelman	0bb27a7165	fix modeloverlay visible change	2017-09-29 17:48:59 -07:00
Nissim Hadar	951ce247a2	Working on adding zone to haze.	2017-09-29 17:36:14 -07:00
Nissim Hadar	2e1919eba5	Merge branch 'master' into hazeZone	2017-09-29 15:16:46 -07:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -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
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