24960 commits

Author	SHA1	Message	Date
samcake	8a3b1a20cc	merge with upstream	2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub	25b5657d58	Merge pull request #11702 from misslivirose/fix/remove-address ... remove href property for non-owned avatar entities	2017-10-27 13:15:47 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
MissLiviRose	c7857d4fc3	actually remove href not script	2017-10-26 17:47:04 -07:00
MissLiviRose	0ab06d624a	remove href property for non-owned avatar entities	2017-10-26 17:35:51 -07:00
samcake	b9112024b8	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-26 14:27:23 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	3e95484c4c	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-26 13:58:50 -07:00
Bradley Austin Davis	becd99a964	Merge pull request #11584 from SamGondelman/pointerEvents ... First step of cleaning up PointerEvents	2017-10-26 12:01:03 -07:00
Sam Gateau	6051a3913f	Merge pull request #11684 from NissimHadar/bugFix8610 ... Bug fix 8610	2017-10-26 10:55:29 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 ... 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
Ken Cooke	30d6185625	Merge pull request #11687 from ctrlaltdavid/21577 ... Fix script reload icon not working in Windows developer builds	2017-10-26 08:35:59 -07:00
luiscuenca	b7c375f396	Cleaning	2017-10-25 19:09:37 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
David Rowe	da33c4fcf2	Fix script reload icon not working in Windows developer builds	2017-10-26 11:41:52 +13:00
Nissim Hadar	2ec62ecc9b	Reduced haze background blend range to 27,000 metres.	2017-10-25 15:12:01 -07:00
Nissim Hadar	bfab466827	Bug 8610.	2017-10-25 14:13:53 -07:00
Nissim Hadar	8d11ace1a6	Bug 8610.	2017-10-25 13:46:59 -07:00
samcake	5b0bbbb21e	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-25 13:14:47 -07:00
luiscuenca	a1c9285c90	Fixed bug on case 6443	2017-10-25 13:13:50 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Brad Hefta-Gaub	0c9184566e	Merge pull request #11678 from AndrewMeadows/fix-broken-build ... fix compile errors after merge	2017-10-25 12:39:34 -07:00
Stephen Birarda	a28f2f19e0	Merge pull request #11674 from utkarshgautamnyu/fix/JSBaker ... Fixed issue with QTextStream in JSBaker	2017-10-25 14:06:43 -05:00
Andrew Meadows	c14bbb76e6	fix compile errors after merge	2017-10-25 11:57:44 -07:00
Andrew Meadows	2d0b94817c	Merge pull request #11336 from 1P-Cusack/21389_PR2 ... WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-25 10:41:21 -07:00
Seth Alves	66e38af1b3	Merge pull request #11671 from ElderOrb/case8553 ... 8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create	2017-10-25 10:31:31 -07:00
Zach Fox	91333cdf7b	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-25 10:26:50 -07:00
Zach Fox	d7bdbfb37b	Fix unix build errors	2017-10-25 09:53:59 -07:00
Seth Alves	815f680475	Merge pull request #11675 from ZappoMan/fixRayPick ... fix ray pick in cases where origin is inside of outer bounding box	2017-10-25 07:07:36 -07:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 ... 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
Brad Hefta-Gaub	bcad2302c4	Merge pull request #11667 from druiz17/crash-keyboard ... Fix keyboard related crash.	2017-10-24 21:17:49 -07:00
Brad Hefta-Gaub	ef78711b7b	Merge pull request #11663 from AndrewMeadows/shape-sharing ... fix incorrect collision shape sharing for some ModelEntityItem configurations	2017-10-24 21:04:57 -07:00
Brad Hefta-Gaub	2a865f3a45	Merge pull request #11666 from SamGondelman/mirrorMode ... Fix backwards HUD in mirror mode	2017-10-24 21:03:29 -07:00
Sam Gateau	f38fa14a39	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-24 21:00:44 -07:00
ZappoMan	9b94f33304	fix ray pick in cases where origin is inside of outer bounding box	2017-10-24 20:48:59 -07:00
utkarshgautamnyu	ff0af9f5cc	Fixed issue with QTextStream	2017-10-24 20:14:02 -07:00
Brad Hefta-Gaub	41b637bc79	Merge pull request #11668 from ZappoMan/cleanupVersions ... Cleanup versions	2017-10-24 16:24:01 -07:00
beholder	39b2c0f83a	fix for FB 8553 & FB 8380	2017-10-25 01:59:56 +03:00
Seth Alves	75f8699bcc	Merge pull request #11665 from NissimHadar/hazeZone ... Changed blend range from 32,000 m to 30,000m	2017-10-24 15:22:24 -07:00
ZappoMan	aad91edba2	actually remove all those defines	2017-10-24 14:45:33 -07:00
ZappoMan	3ded26b0e9	Merge branch 'master' of https://github.com/highfidelity/hifi into cleanupVersions	2017-10-24 14:44:06 -07:00
Brad Hefta-Gaub	ecf8d35f5f	Merge pull request #11664 from ZappoMan/callEntityClientMethod ... implement callEntityClientMethod	2017-10-24 14:43:39 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Zach Fox	b092862b03	Missed another spot	2017-10-24 14:23:06 -07:00
Dante Ruiz	f29937fb88	Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard	2017-10-24 13:54:21 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
ZappoMan	5901d1a311	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
Zach Fox	48c8d52c09	Cleanup	2017-10-24 13:30:27 -07:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00