25435 commits

Author	SHA1	Message	Date
samcake	6b1e2d0d5a	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-10 12:37:06 -08:00
Anthony Thibault	08c12a1ced	Merge pull request #11704 from AndrewMeadows/shape-manager-key ... cleanup ShapeInfo hash generation	2017-11-10 11:31:46 -08:00
Anthony J. Thibault	ba4c0f189e	code review feedback ... removed discontinuity in safeDeltaTime, which is used to prevent division by zero.	2017-11-10 10:25:29 -08:00
beholder	5fcde1186a	hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard	2017-11-10 21:20:00 +03:00
beholder	db3ed81513	adjust to changed requirements: ... 1. The keyboard collapse button is moved to the lower right, replacing the keys there 2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift 3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right	2017-11-10 21:20:00 +03:00
beholder	a9fe3596cf	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
Anthony J. Thibault	4169e11e77	Merge branch 'master' into bug-fix/div-by-zero	2017-11-10 10:15:26 -08:00
Sam Gateau	608093eee5	reverting the change in light direction /oritenation	2017-11-10 02:55:22 -08:00
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
ZappoMan	c6947dd165	some side by side plumbing for NLPackets and NLPacketLists	2017-11-09 18:20:06 -08:00
Anthony Thibault	de9eeff7d2	Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer ... Fix for address sanitizer warning	2017-11-09 14:19:03 -08:00
David Rowe	2c542b73a0	Fix particles emitter rendering not updating when edit textures URL	2017-11-10 10:22:35 +13:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
Elisa Lupin-Jimenez	119c662899	fixed null file path in file dialog call	2017-11-09 11:46:19 -08:00
Anthony J. Thibault	9724a5e5b8	Fix for address sanitizer warning ... This fixes a potential null pointer dereference.	2017-11-09 10:53:36 -08:00
Anthony J. Thibault	5507bcea3c	Remove hack for missing inttypes.h header on VS2010	2017-11-09 10:34:01 -08:00
Olivier Prat	4f7ed38e98	Fixed potential link errors on Mac	2017-11-09 11:26:08 +01:00
Olivier Prat	bccd6df57c	Fixed warning on Mac and Ubuntu	2017-11-09 11:19:28 +01:00
luiscuenca	1791ed01ca	add width param to vertex shader	2017-11-08 18:35:26 -07:00
Brad Hefta-Gaub	d608d6ebf4	Merge pull request #11763 from Atlante45/new-master ... Merge stable back into master	2017-11-08 15:10:06 -08:00
Seth Alves	34500fdf18	Merge pull request #11773 from vladest/fix_avatar_new_attachment ... Remove checking of empty model url and add sanity for checking modelU…	2017-11-08 14:15:17 -08:00
Ryan Huffman	3a9c364837	Fix domain server label not handling spaces correctly	2017-11-08 13:09:42 -08:00
vladest	6685b74c2a	Remove checking of empty model url and add sanity for checking modelUrl field existing	2017-11-08 21:23:50 +01:00
samcake	af1180255e	fixes from code review	2017-11-08 11:45:40 -08:00
samcake	75ce61c3a6	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-08 11:30:53 -08:00
Olivier Prat	bbcb0b2d9b	Fixed highlight in stereo mode, including HMD (testing on simulator)	2017-11-08 13:49:18 +01:00
Olivier Prat	f996435ac8	Merge branch 'master' of git://github.com/highfidelity/hifi into highlight	2017-11-08 11:41:21 +01:00
Olivier Prat	39604363ea	Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes	2017-11-08 11:38:20 +01:00
Olivier Prat	91d8435a99	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-08 08:17:55 +01:00
Sam Gateau	3ef9ce0af6	Merge pull request #11732 from NissimHadar/hazeMaskFix ... Haze mask fix	2017-11-07 17:37:24 -08:00
samcake	0718763ed1	Adjust syntax	2017-11-07 17:31:15 -08:00
luiscuenca	ee3900be4f	Corrections	2017-11-07 18:26:41 -07:00
Luis Cuenca	6fb47eef85	Merge branch 'master' into case7587	2017-11-07 17:19:39 -07:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07:00
Atlante45	8a903c8b12	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-11-07 14:26:25 -08:00
samcake	6481e0f713	Address cauterized cluster matrices issue	2017-11-07 12:52:23 -08:00
samcake	5ca3113709	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-07 10:42:28 -08:00
Clément Brisset	85efe5265d	Merge pull request #11724 from ctrlaltdavid/21580 ... Fix serverScripts not being able to see entities in parent/child tree	2017-11-07 10:36:20 -08:00
Seth Alves	7c6b5081d6	Merge pull request #11725 from luiscuenca/case8270 ... 8270 Changing avatars while sitting - restore animations	2017-11-07 09:55:06 -08:00
Olivier Prat	0bbd1edc0a	Fixed fluttering highlight bug by attaching only stencil when drawing outline	2017-11-07 18:26:15 +01:00
Olivier Prat	ffa46b487a	Only non empty selections are now linked to highlight passes	2017-11-07 17:07:37 +01:00
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	84be026e0b	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-07 09:48:45 +01:00
samcake	f665bf384b	merge with upstream, and clean code	2017-11-06 17:02:10 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
samcake	eaed02b144	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-06 13:52:05 -08:00
samcake	dfa4afc7f6	and again, clean up	2017-11-06 12:47:34 -08:00
samcake	9652902911	Removing the changes that i introduced by mistake from another branch :((((	2017-11-06 12:43:22 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
samcake	d878fac62c	REverse changes	2017-11-06 11:25:02 -08:00
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Olivier Prat	09ee69db30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-06 09:47:48 +01:00
Sam Gateau	45e5d91b9d	Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model	2017-11-04 20:49:55 -07:00
David Rowe	05275afb4f	Resending full scene is not necessary after all	2017-11-05 15:48:02 +13:00
David Rowe	2d27a6cf4c	Merge branch 'master' into 21580	2017-11-05 13:59:43 +13:00
ZappoMan	d4b4d188ed	allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU	2017-11-04 13:40:41 -07:00
Sam Gateau	7da69633f3	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-03 20:20:53 -07:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
samcake	053052a95d	removing warnings	2017-11-03 13:28:20 -07:00
Brad Hefta-Gaub	d5eb670819	Merge pull request #11746 from highfidelity/RC-58 ... Merge RC58 into master	2017-11-03 12:50:02 -07:00
Melissa Brown	a14e98053e	Merge pull request #11138 from Nex-Pro/21466 ... Fix Avatar Rotation upon Teleporting Using PAL	2017-11-03 11:58:15 -07:00
Olivier Prat	fcf1c301b6	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
John Conklin II	c946e46506	Merge pull request #11737 from AndrewMeadows/scale-to-fit_RC-58 ... RC-58: scaleToFit() the model before updating render items	2017-11-03 09:46:20 -07:00
Olivier Prat	79c2da3dcb	Removed cull functor from shadow render task as it is inadapted for the shadow's orthographic projection	2017-11-03 16:52:29 +01:00
Olivier Prat	fbcb2924e8	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-03 15:08:15 +01:00
Olivier Prat	e0fd71f246	Merged from master	2017-11-03 14:39:42 +01:00
Olivier Prat	4b598a6e24	Working stencil mask with object bounding boxes	2017-11-03 14:26:36 +01:00
Sam Gateau	390f5b53ca	cleaning more code	2017-11-02 23:55:44 -07:00
Sam Gateau	c11f46a8d3	cleaning more code	2017-11-02 23:35:18 -07:00
Sam Gateau	421aacd8eb	Yes	2017-11-02 22:45:19 -07:00
Sam Gateau	70134d67eb	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 19:49:22 -07:00
Sam Gateau	f097d66721	YEp it s working	2017-11-02 19:49:01 -07:00
ZappoMan	74ceab1e68	fix mac and unic build	2017-11-02 19:30:39 -07:00
samcake	d33c75865e	Removing unecessary test	2017-11-02 18:11:13 -07:00
samcake	83bfa1c5f2	Progressing on the cluster updates	2017-11-02 17:57:46 -07:00
Brad Hefta-Gaub	6dbffe2367	Merge pull request #11736 from AndrewMeadows/scale-to-fit ... scaleToFit() the model before updating render items	2017-11-02 17:49:05 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
ZappoMan	baff900839	cleanup some writeLocks	2017-11-02 17:46:15 -07:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
John Conklin II	b990b4f3e0	Merge pull request #11726 from NissimHadar/newHazeZoneUpdate ... RC-58: Fix entity serialization bug due to Zone Haze group properties	2017-11-02 16:40:01 -07:00
John Conklin II	a4e6b2911d	Merge pull request #11734 from highfidelity/stable ... Make sure RC-58 is up to date with stable	2017-11-02 16:39:27 -07:00
ZappoMan	53c6eeb58b	updatePosition now setPosition	2017-11-02 15:58:50 -07:00
Zach Fox	48979a5ce8	Merge pull request #11730 from zfox23/pop_avatarEntityTests ... Commerce: Avatar Entity Tests	2017-11-02 15:34:37 -07:00
samcake	84ad1ab266	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 15:04:43 -07:00
Stephen Birarda	25c10d5de2	Merge pull request #11735 from highfidelity/stable ... Merge stable back into master	2017-11-02 14:22:31 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Andrew Meadows	2b06df1c33	call Model::scaleToFit() before update render items	2017-11-02 12:52:46 -07:00
Andrew Meadows	60fce3d4f7	make Model::scaleToFit() public not protected	2017-11-02 12:52:31 -07:00
Nissim Hadar	d8191e3bd2	Fixed Mask test.	2017-11-02 12:45:18 -07:00
Andrew Meadows	490483fde8	call Model::scaleToFit() before update render items	2017-11-02 12:32:51 -07:00
Andrew Meadows	db9c3cc103	make Model::scaleToFit() public not protected	2017-11-02 12:31:36 -07:00
Nissim Hadar	51964dd4be	Merge branch 'master' into hazeMaskFix	2017-11-02 11:42:42 -07:00
luiscuenca	81509b3e92	coding standard	2017-11-02 10:34:57 -07:00
samcake	428a4675b1	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 09:06:17 -07:00
Sam Gateau	56510abd1e	Trying to set the ClusterBuffer in the render loop instead of the game loop	2017-11-02 03:45:27 -07:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
luiscuenca	c834cf1cf3	Comments and corrections	2017-11-01 21:55:31 -07:00
Nissim Hadar	2e6c849b63	Added comment.	2017-11-01 20:31:44 -07:00
luiscuenca	9e0e1ab5a5	erase comment	2017-11-01 19:56:16 -07:00
luiscuenca	e201e82ec2	formatting	2017-11-01 19:45:56 -07:00
luiscuenca	6a2dc38fdd	restoring previous roles	2017-11-01 19:38:37 -07:00
samcake	455f2ad277	trying to change the root transorm update	2017-11-01 18:14:36 -07:00
Nissim Hadar	67552d2b7d	Change stencil mask used with Haze.	2017-11-01 17:39:37 -07:00
Ryan Huffman	edc7b91a42	Fix comment in NetworkingConstants referencing shared.js location	2017-11-01 12:57:07 -07:00
Zach Fox	bb1ffbc06f	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests	2017-11-01 12:38:34 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Nissim Hadar	3d3c93f1a5	Fixes Bug 8802	2017-11-01 11:23:18 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
luiscuenca	da63e85699	Bug 8270 fixed	2017-11-01 09:17:04 -07:00
Ken Cooke	82d9827571	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07:00
David Rowe	328fc29bc5	Fix serverScripts not being able to see entities in parent/child tree	2017-11-01 17:01:19 +13:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00
Atlante45	7616fe193c	Migrate the DS config version to the config file	2017-10-31 17:35:23 -07:00
SamGondelman	5a7298f15b	Merge remote-tracking branch 'upstream/master' into pointers	2017-10-31 17:33:52 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
Stephen Birarda	b8370128ce	remove master config from HifiConfigVariantMap/domain-server	2017-10-31 16:19:50 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Zach Fox	e9c144892a	Fixes	2017-10-31 13:11:32 -07:00
Zach Fox	f5ada4fe62	Will it compile?	2017-10-31 12:33:28 -07:00
Zach Fox	6f96e0c7bd	More progress	2017-10-31 12:14:12 -07:00
Zach Fox	90e9251176	It's a start	2017-10-31 11:28:19 -07:00
Ken Cooke	cfba6ae819	Implement master avatar gain in the audio-mixer	2017-10-31 11:18:03 -07:00
Bradley Austin Davis	55d819d7e3	Merge pull request #11699 from SamGondelman/ui ... Pointers generate PointerEvents (WIP)	2017-10-31 10:01:15 -07:00
Nissim Hadar	f3147fc24f	Merge branch 'master' into hazeZone	2017-10-30 21:41:23 -07:00
Nissim Hadar	3ddf970be3	Removed haze init variables from the model namespace.	2017-10-30 21:40:14 -07:00
Nissim Hadar	636f7858a3	Removed _degs and _m suffixes.	2017-10-30 19:45:08 -07:00
Nissim Hadar	b00db6a68f	Correction.	2017-10-30 19:20:49 -07:00
Brad Hefta-Gaub	c1a808e726	Merge pull request #11703 from AndrewMeadows/circles-and-quads ... fix Circles and quads	2017-10-30 18:03:32 -07:00
Zach Fox	19420a0ff2	Move static cert verify to properties	2017-10-30 17:01:55 -07:00
luiscuenca	8d5c95b1d6	Various corrections	2017-10-30 16:47:59 -07:00
SamGondelman	76eb4c656e	fix multi-touch and keyboard on web entities	2017-10-30 16:41:59 -07:00
Nissim Hadar	1357877618	Replaced separate RGB components of colours with vec3's.	2017-10-30 12:41:09 -07:00
Nissim Hadar	5fc68cae0d	Converted Haze initialization values to static.	2017-10-30 11:51:19 -07:00
Nissim Hadar	d6b3fa4cb1	Removed references to Haze from Stage.	2017-10-30 10:49:08 -07:00
SamGondelman	e9a5acda06	control hovering, preset buttons for clicking, constness, scroll off ... surface	2017-10-30 10:28:43 -07:00
Nissim Hadar	349e12c065	Merge branch 'master' into hazeZone	2017-10-30 10:08:35 -07:00
Brad Davis	23653f08ca	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-30 09:20:58 -07:00
Stephen Birarda	05cfd72464	Merge pull request #11707 from Atlante45/feat/wizard ... Domain Settings tweaks + Domain Setup Wizard	2017-10-30 08:39:31 -07:00
Ken Cooke	a99b1ffa23	HRTF cleanup	2017-10-29 18:01:43 -07:00
Ken Cooke	6ba2a83bbe	Send and receive Avatar MASTER Gain packets, signaled using null nodeID. ... Packet protocol change is not needed (existing audio-mixer will ignore).	2017-10-29 10:47:56 -07:00
divya	de4fd269ef	Merge pull request #11701 from birarda/bug/local-ds-inconnect ... only respond to expected ICE peers in DS	2017-10-28 21:23:05 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Ryan Huffman	c42ef4f88c	Update most DS API forwarding APIs to use a single forwarding function	2017-10-27 15:53:50 -07:00
Nissim Hadar	fb6c5b98d6	Merge branch 'master' into hazeZone	2017-10-27 15:40:03 -07:00
Nissim Hadar	a5a135c2ba	Fixes for 8672-8674.	2017-10-27 15:39:14 -07:00
Atlante45	ae9f87873f	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard	2017-10-27 15:27:00 -07:00
samcake	8a3b1a20cc	merge with upstream	2017-10-27 14:57:25 -07:00
ZappoMan	1000318dff	tweak min dimension to match current behavior	2017-10-27 14:26:02 -07:00
Olivier Prat	3a977f6039	Disabled stereo in batch when using full screen outline	2017-10-27 22:59:23 +02: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
Atlante45	203a419f2a	Setup Wizard	2017-10-27 12:52:36 -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
Ryan Huffman	92aa66cdd7	Update domain settings to include domain info editing	2017-10-27 11:49:40 -07:00
Ryan Huffman	7dc475c695	Update domain server settings ... Move requests that require access token to go through DS Update various styling and ease of use on DS settings page Update domain server settings CP CP	2017-10-27 11:49:34 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Andrew Meadows	2c4d4373dc	support asymmetrical cross section Cylinder	2017-10-27 10:41:16 -07:00
Stephen Birarda	689828e3fa	add packet version change for ICE ping change	2017-10-27 10:00:49 -07:00
Nissim Hadar	420b0f321c	Merge branch 'master' into hazeZone	2017-10-27 09:14:53 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Andrew Meadows	137fccbd91	cleanup ShapeFactory implementation	2017-10-27 08:56:26 -07:00
Andrew Meadows	d45febf1db	add description of ShapeManager in comments	2017-10-27 08:55:41 -07:00
Olivier Prat	4cbee72eae	Fixed warning on Mac and Ubuntu	2017-10-27 17:50:22 +02:00
Olivier Prat	4cadcd79bf	Return full viewport when scissor is disabled and items in outline group	2017-10-27 17:07:19 +02:00
Andrew Meadows	b00d158342	remove DoubleHashKey: it is no longer used	2017-10-27 07:52:51 -07:00
Andrew Meadows	45e571dd02	cleanup ShapeInfo::getHash()	2017-10-27 07:52:51 -07:00
Olivier Prat	dc8c75f403	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-27 15:56:40 +02:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00
Andrew Meadows	2710dca37c	fix rendering of Circles and Quads	2017-10-26 22:58:50 -07:00
Andrew Meadows	474609dabf	enforce dimensions of Circles and Quads	2017-10-26 22:58:24 -07:00
Andrew Meadows	901e145712	remove redundant dimensionsChanged()	2017-10-26 22:57:33 -07:00
ZappoMan	431ee58577	more cleanup	2017-10-26 21:30:59 -07:00
ZappoMan	e5becba4e9	migrate away from updateXXX standardize on setXXX	2017-10-26 20:38:07 -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
Stephen Birarda	10d05ba6c9	only respond to expected ICE peers in DS	2017-10-26 16:34:49 -07:00
SamGondelman	7951826e49	more advanced laser focusing	2017-10-26 16:10:27 -07:00
SamGondelman	f0c15e874c	merge with master	2017-10-26 14:52:17 -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
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
SamGondelman	cf34fe3345	laserpointers generate pointerevents	2017-10-26 12:01:09 -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
Olivier Prat	0044759196	Disabled broken PCF and reset back to previous bias	2017-10-26 18:29:29 +02:00
Nissim Hadar	c5c996f186	Cleanup.	2017-10-26 09:21:38 -07:00
Olivier Prat	44393f12d9	Adjusted bias	2017-10-26 17:41:54 +02: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
Nissim Hadar	b820f397fc	Fix zero-divide.	2017-10-26 08:39:22 -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
Olivier Prat	5d83284ac5	Fixed small bug in shadow bounds computation	2017-10-26 16:47:20 +02:00
Olivier Prat	186b531be6	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-26 15:12:09 +02:00
Olivier Prat	9eed69d7ef	Trying to pin point a zone bug	2017-10-26 15:11:42 +02:00