3494 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	fbcd813d7b	Merge pull request #11694 from ElderOrb/FB8315 ... 8315 Stylus appears in wrong place on hand	2017-10-30 18:00:56 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
Andrew Meadows	0f1139343c	Merge pull request #11709 from druiz17/equip-adjustment ... Remember adjustment made to equipped entities	2017-10-30 15:45:28 -07:00
Nissim Hadar	6391282680	Swapped location of keylight attenuation and the blending factor.	2017-10-30 12:05:23 -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
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
Nissim Hadar	fb6c5b98d6	Merge branch 'master' into hazeZone	2017-10-27 15:40:03 -07:00
samcake	8a3b1a20cc	merge with upstream	2017-10-27 14:57:25 -07:00
Dante Ruiz	e9298b6ff8	Merge branch 'master' of github.com:highfidelity/hifi into equip-adjustment	2017-10-27 14:46:18 -07:00
Dante Ruiz	bea0df8e60	implemented remebering equiping entities offset	2017-10-27 14:46:04 -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
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	5ed58d5e5d	enable Quad in ShapeEntityItem properties	2017-10-26 22:59:25 -07:00
samcake	1dbeac7b88	Adding the idons for Luci and cleaning up the scripts	2017-10-26 19:55:59 -07:00
Zach Fox	8cb60fc62c	Small edit.js changes	2017-10-26 16:44:21 -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
beholder	ddd25da430	8315 Stylus appears in wrong place on hand	2017-10-26 19:39:15 +03:00
Seth Alves	0f31631f17	Merge pull request #11677 from druiz17/fix-fargrab ... Make non-dynamic entities collisionless during far-grab	2017-10-25 17:31:02 -07:00
Zach Fox	2f28cf1443	Remove unnecessary newline	2017-10-25 15:20:31 -07:00
Zach Fox	3f0108528d	Remove unnecessary newline	2017-10-25 15:19:56 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
ZappoMan	226b974ce8	DPI is not a decimal	2017-10-25 11:59:29 -07:00
Dante Ruiz	2ec8f3f625	made non-dynamic entities collisionless during far-grab	2017-10-25 11:29:32 -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
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
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Zach Fox	4b50454104	Missed a spot	2017-10-24 14:13:14 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
David Back	80dc98b2c2	remove prints	2017-10-23 14:23:45 -07:00
David Back	b5f1793863	add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-23 14:21:18 -07:00
Zach Fox	cda43ec1ea	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-23 11:52:59 -07:00
Daniela	f15038c54f	Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool.	2017-10-23 19:11:32 +01:00
Daniela	32b5776743	Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos	2017-10-23 18:51:40 +01:00
SamGondelman	7686948daf	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
Zach Fox	ae1b2bd931	'Tis a silly hack	2017-10-20 11:11:23 -07:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
Zach Fox	0dc6211a7d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 14:43:33 -07:00
Ryan Huffman	894e91ea23	Merge pull request #10702 from CraftsmanMG/master ... Fingerpaint PR	2017-10-19 13:13:59 -07:00
Zach Fox	24d109cfe7	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 12:13:38 -07:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
Daniela	b28a99c2af	Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos	2017-10-19 18:06:23 +01:00
Daniela	a02ee5b7d5	Grabber Tool Move up, remove billboard on grabbermoveupoverlay	2017-10-19 18:05:51 +01:00
Brad Hefta-Gaub	e2ccfb84f9	Merge pull request #11626 from Delanir/BubbleScaleMaster ... 7429 IPD Secondary Task List: bubble.js Scale	2017-10-19 09:31:15 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
Seth Alves	28d0da51b9	Merge pull request #11628 from luiscuenca/case8269 ... 8269 controllerDispatcher is creating log spam with web entities	2017-10-18 18:11:13 -07:00
Sam Gateau	4d7accabdf	Merge pull request #11439 from NissimHadar/hazeZone ... Adding haze component to the zone entity.	2017-10-18 16:14:28 -07:00
luiscuenca	6e8756e8af	Debug mode has been turned off	2017-10-18 15:40:03 -07:00
Zach Fox	6c7096b0d7	Fix login button injection on individual item page	2017-10-18 14:53:39 -07:00
Daniela	e9f3dd6e44	Merge BubbleScale for IPD with hifi master.	2017-10-18 22:29:12 +01:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
David Rowe	f31e014e8b	Quat.ZERO --> Quat.IDENTITY	2017-10-18 20:34:55 +13:00
David Rowe	5b6d33bcb2	Missing semicolon	2017-10-18 20:29:34 +13:00
David Rowe	f74c33f597	Fix importing entities from URL	2017-10-18 17:44:36 +13:00
SamGondelman	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
Nissim	935180bf09	Fixed my bloody stupid mistake...	2017-10-17 15:02:05 -07:00
Zach Fox	f3b641a833	Edit.js caused a testing fail :(	2017-10-17 11:30:15 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
Nissim	1b42572f99	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone ... # Conflicts: # scripts/system/html/js/entityProperties.js	2017-10-16 14:29:56 -07:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
Nissim	fd2b0da76d	First version.	2017-10-16 12:20:31 -07:00
Zach Fox	1cf816a261	Fix Wallet notification appearing when taking screenshots	2017-10-16 11:15:09 -07:00
Nissim Hadar	afb8b2d8e7	Merge branch 'master' into hazeZone	2017-10-13 13:40:06 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Zach Fox	17a0dd2a76	Elide long usernames in injected code	2017-10-13 13:32:55 -07:00
Seth Alves	fe9f142bf6	Merge pull request #11562 from druiz17/fix-release-grab ... include release message to controller modules	2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub	9f3331ec19	Merge pull request #11587 from druiz17/stylus-fix ... Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional	2017-10-13 12:42:26 -07:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
Dante Ruiz	d14e6b6e5a	Merge pull request #11450 from ElderOrb/case7722 ... 7722 Add onHover Outline to Tablet "X" Button	2017-10-13 11:38:38 -07:00
druiz17	6799b9ca13	fix stylus	2017-10-13 09:34:08 -07:00
Nissim Hadar	b1174ce40c	Merge branch 'master' into hazeZone	2017-10-12 17:04:42 -07:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities ... Import av entities	2017-10-12 13:30:53 -07:00
beholder	8c7462f012	fine-tuning based on discussion with Anshuman	2017-10-12 22:21:40 +03:00
Nissim Hadar	dc45c7af75	Implemented radio-buttons.	2017-10-12 11:18:18 -07:00
vladest	2d010980b0	Removed special sound for Mute and replace it with hover and click sounds	2017-10-12 19:15:09 +02:00
vladest	da734b628c	Remove sound on stylus show and hide	2017-10-12 18:54:40 +02:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
Nissim Hadar	d0deaa631c	Trying to pretty-up.	2017-10-12 07:54:03 -07:00
Nissim Hadar	00609c9547	Name correction.	2017-10-12 07:37:44 -07:00
beholder	9c15af9fbe	raise highlight above button overlay to reduce flickering	2017-10-12 14:46:01 +03:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Nissim Hadar	a21995db24	Added checkbox for altitude effect.	2017-10-11 22:10:58 -07:00
Nissim Hadar	3ec8faa1b9	Added checkbox for altitude effect of haze.	2017-10-11 20:47:39 -07:00
Nissim Hadar	96fd3123e8	Changed haze altitude to ceiling.	2017-10-11 20:36:24 -07:00
Nissim Hadar	2f4ddd84f8	Renamed haze colours and moved checkbox for glare.	2017-10-11 19:32:09 -07:00
Nissim Hadar	748f97364b	Moved Bakground Blend to end of Haze fields.	2017-10-11 19:20:46 -07:00
Nissim Hadar	832f9fb6e3	Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.	2017-10-11 19:10:51 -07:00
Nissim Hadar	ea6b9ed28e	Removed ...ALTITUDE_MODE from combo.	2017-10-11 18:58:59 -07:00
Zach Fox	99109fe8e5	Merge pull request #11567 from zfox23/commerce_daveIntegration3 ... 2017-10-10 Commerce Frontend Updates	2017-10-11 11:07:03 -07:00
Zach Fox	c2733a4186	Fix notification bug	2017-10-11 09:47:16 -07:00
druiz17	67944c40a1	Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab	2017-10-11 09:13:01 -07:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
druiz17	e77ac9fd10	include release message	2017-10-10 13:47:33 -07:00
Zach Fox	1c0a564155	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3	2017-10-10 12:36:06 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -07:00
Seth Alves	4a3b59ea61	Merge pull request #11560 from druiz17/far-grab-nondynamic ... Far grab non-dynamic entities	2017-10-10 12:29:38 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Melissa Brown	662bb6c103	Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 ... [Case 6491] Remainder of entitySelectionTool clean up (details below).	2017-10-10 10:36:14 -07:00
druiz17	a179df29fb	mouse grab non-dynamic entities	2017-10-10 10:31:40 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
Daniela	a46ef56af9	Merge with hifi:master. Packet Headers version were increased.	2017-10-10 17:26:33 +01:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
Nissim Hadar	1a932fbaf0	Corrected error in html.	2017-10-09 19:10:30 -07:00
Nissim Hadar	71f567f15a	Merge branch 'master' into hazeZone	2017-10-09 17:28:10 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" ... This reverts commit 28a8b18060.	2017-10-09 11:52:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities ... fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Nissim Hadar	bfdd489682	Fixed color selector bug.	2017-10-06 13:18:12 -07:00
Seth Alves	8d00731620	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 07:20:34 -07:00
LaShonda Hopper	2f082d9e86	[Case 6491] Fixes issue in normalizeDegrees from last commit (details below). ... The range of the function is targeting (-180, 180] such that the statement: if (degrees < -180) should be: if (degrees <= -180) to account for degrees being -180. Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-06 10:11:26 -04:00
LaShonda Hopper	707569b230	[Case 6491] More efficient version of normalizeDegrees function (details below). ... Refactoring the original normalizeDegrees function to be more efficient as suggested via: https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585 Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-06 09:50:24 -04:00
Nissim Hadar	76aace980a	Merge branch 'master' into hazeZone	2017-10-05 20:32:43 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	3afab3c1d3	Keylight attenuation implemented.	2017-10-05 18:25:02 -07:00
Nissim Hadar	f261477aa2	Adding sun attenuation.	2017-10-05 17:55:24 -07:00
David Rowe	105457b388	Don't unbusubscribe from possibly shared channel	2017-10-06 13:27:08 +13:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
Nissim Hadar	e15699192d	Added blend angle and altitude reference base.	2017-10-05 14:18:03 -07:00
Nissim Hadar	2e2364e03f	WIP - adding haze blend out colour	2017-10-05 13:20:21 -07:00
Nissim Hadar	cbaae2c79b	WIP - haze colour.	2017-10-05 12:59:56 -07:00
Nissim Hadar	395d9cbd6b	WIP - haze colour.	2017-10-05 12:13:37 -07:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
Nissim Hadar	512b469dc6	Added haze colour selector.	2017-10-05 11:31:49 -07:00
Nissim Hadar	595530161a	WIP - adding background blend. ... Haze altitude works.	2017-10-05 09:28:55 -07:00