4028 commits

Author	SHA1	Message	Date
John Conklin II	2eb801bdc6	Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements ... Further avatar-mixer improvements	2018-10-25 12:25:32 -07:00
Jeff Clinton	67fe43ebb1	Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars ... Small avatars now have a minimum jump height of 0.25 meters	2018-10-24 17:08:28 -07:00
Simon Walton	e22e0ecb04	Merge branch 'master' into avatar-mixer-improvements	2018-10-24 10:39:23 -09:00
Simon Walton	0a78eeaf1a	Merge branch 'master' into avatar-mixer-improvements	2018-10-23 15:56:56 -07:00
Zach Fox	493262052c	Remove extraneous code changes; remove QUrlAncestry code; remove extra logging	2018-10-22 13:59:52 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
Anthony Thibault	6cc7c861d1	Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest ... Disable user hand controllers if they are too far away or not moving.	2018-10-19 14:02:32 -07:00
Anthony Thibault	ef74014075	Small avatars now have a minimum jump height of 0.25 meters ... This should improve the quality of the jump animation and improve the mobility of small avatars.	2018-10-19 13:55:56 -07:00
Simon Walton	0b2ee35907	Merge branch 'master' into avatar-mixer-improvements	2018-10-18 14:13:39 -07:00
Zach Fox	2f37a2b1a1	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
John Conklin II	1cc2569bd8	Merge pull request #13596 from SamGondelman/scriptvec3 ... Replace vec2, vec3, and xColor properties with JS prototypes	2018-10-18 09:47:56 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
John Conklin II	8e5bc1678f	Merge pull request #14219 from SamGondelman/materialCull ... QueryAACube fixes and materials expand to include their parent	2018-10-17 15:15:23 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
John Conklin II	9f0b4fb437	Merge pull request #14122 from SamGondelman/skybox ... Rebake default skybox for all platforms	2018-10-17 09:50:00 -07:00
Anthony Thibault	27c495406e	Disable user hand controllers if they are too far away or not moving.	2018-10-16 17:24:47 -07:00
SamGondelman	49b496046b	queryAACube fixes	2018-10-16 14:35:39 -07:00
SamGondelman	ded8d4b547	variant conversions	2018-10-16 11:55:28 -07:00
Sam Gondelman	121fc7205c	Delete Default-Sky-9-cubemap.texmeta	2018-10-14 22:36:22 -07:00
SamGondelman	9788aa307e	remove width/height/depth	2018-10-10 12:38:07 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Simon Walton	6f659db3b5	Merge branch 'master' into avatar-mixer-improvements	2018-10-08 15:18:29 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
Sam Gondelman	4e96c3297b	Merge branch 'master' into scriptvec3	2018-10-03 17:14:15 -07:00
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
sabrina-shanman	67dc526ee2	Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2	2018-10-01 17:17:32 -07:00
John Conklin II	3ab83731b9	Merge pull request #14087 from sethalves/quiet-asan ... fix several uninitialized reads	2018-10-01 16:48:54 -07:00
sabrina-shanman	0cf7e954cc	Simplify a RayPick and StylusTip constructor	2018-10-01 09:20:59 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
David Rowe	1c4bde3e84	Fix build warnings	2018-09-28 18:38:38 +12:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
sabrina-shanman	74937a1979	Serialize PickRay according to its variables	2018-09-27 14:41:38 -07:00
sabrina-shanman	3ac9478101	Assign _mathPick in the Pick constructor	2018-09-27 11:30:57 -07:00
John Conklin II	6c47ba0dc7	Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps ... Use C++ chrono system_clock for timestamps	2018-09-26 11:22:49 -07:00
sabrina-shanman	4011660435	Merge branch 'master' into stt_parenting2	2018-09-26 10:17:45 -07:00
Seth Alves	ff2a47e7e6	fix several uninitialized reads	2018-09-26 09:33:12 -07:00
David Rowe	b98bd741b8	Indent and reword jumping and flying checkbox	2018-09-26 18:14:02 +12:00
David Rowe	af1b4fef5d	Modify layout of rotation mode settings options	2018-09-25 18:03:57 +12:00
Simon Walton	d5977612a1	Merge branch 'master' into avatar-mixer-improvements	2018-09-24 13:29:45 -07:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12:00
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
Simon Walton	7bba4d4bad	Change priorities in the correct place	2018-09-19 18:38:20 -07:00
Simon Walton	f1b7097edb	Priority experiment	2018-09-19 15:32:56 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
Simon Walton	6a1c76d14d	Only sort an estimated number of avatars	2018-09-14 12:19:55 -07:00
sabrina-shanman	237022d304	Refactor new pick parenting system for use with RayPick, ParabolaPick	2018-09-14 10:28:15 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00