59639 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Howard Stearns	22f0ef33ed	Merge pull request #11496 from howard-stearns/certificate-properties ... Certificate properties	2017-10-03 10:06:48 -07:00
Seth Alves	41dfdf4d82	Merge pull request #11509 from druiz17/fix-hud-module ... Hud module. check if laser is pointing at UI element without moving the reticle first	2017-10-03 09:44:45 -07:00
druiz17	86f580919c	remove what space	2017-10-02 17:43:43 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
Howard Stearns	9b0ebf0e07	doh! string not boolean	2017-10-02 16:18:28 -07:00
Howard Stearns	0b7af66016	more linux warnings	2017-10-02 15:38:59 -07:00
Seth Alves	cc50bf9b56	Merge pull request #11503 from ElderOrb/case7951 ... 7951 Reload button in Running Scripts dialog stops script	2017-10-02 14:20:34 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Howard Stearns	136381adb9	fatal compiler warning on mac/linux	2017-10-02 13:56:15 -07:00
Howard Stearns	7b0321c1e1	guess for mac/linux openssl	2017-10-02 12:30:25 -07:00
beholder	cc8f1352da	7951 Reload button in Running Scripts dialog stops script	2017-10-02 22:18:03 +03:00
Andrew Meadows	0fc6bf1e89	Merge pull request #11471 from Atlante45/feat/auto-bake ... Asset Browser tweaks	2017-10-02 11:29:36 -07:00
Howard Stearns	5c5f052bc2	explicit free, and remove header that isn't available on mac/linux	2017-10-02 10:28:47 -07:00
Sam Gateau	68046ae4e3	Merge pull request #11491 from jherico/dev/disable_watchdog ... Disable watchdog with environment variable	2017-10-02 10:19:32 -07:00
Howard Stearns	930832bb19	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-10-02 09:44:29 -07:00
Howard Stearns	0f6884dd80	fix mac/linux compiler error	2017-10-02 09:44:10 -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
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Howard Stearns	73c8da99dc	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-29 16:46:43 -07:00
Howard Stearns	58255abe12	animation url and computing certificateID	2017-09-29 16:32:25 -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