4955 commits

Author	SHA1	Message	Date
Sam Gateau	2c51e516eb	Merge pull request #11744 from Zvork/shadow ... Shadow caster culling fix	2017-11-15 09:49:39 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Olivier Prat	bf46ccefaf	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-15 08:59:36 +01:00
Zach Fox	d6c244d1d5	Remove incorrect logic	2017-11-14 14:54:03 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Dante Ruiz	b026cfc42f	make sure teleport pointers are deleted	2017-11-14 14:09:08 -08:00
luiscuenca	26e401a069	fix broken HMD notifications	2017-11-14 14:22:53 -07:00
Dante Ruiz	54075d4c9a	make hud laser relative to camera	2017-11-14 13:09:16 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -08:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
Dante Ruiz	416a47cfc7	adding controller haptic feedback to tablet onPress	2017-11-14 09:34:17 -08:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -08:00
Dante Ruiz	132b33dbe7	disable stylus pointer when not being used	2017-11-13 14:53:54 -08:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Brad Davis	69029b49f3	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 14:29:49 -08:00
Dante Ruiz	7613bddefa	fixing some issues with hud module	2017-11-13 14:26:34 -08:00
Dante Ruiz	5852224a31	clean up code and finialize changes	2017-11-13 13:37:53 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Olivier Prat	ac0e816f8c	Cascade selection working on shadow but not in Luci debug mode	2017-11-13 18:42:34 +01:00
Olivier Prat	7515c341ad	Merged with PCF fix with dithered filtering	2017-11-13 14:47:35 +01:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
Olivier Prat	fa58cf2e60	Merged with master	2017-11-13 14:07:48 +01:00
Nissim Hadar	f629357ded	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
Dante Ruiz	43c6d71236	fix stylus module	2017-11-10 17:28:55 -08:00
luiscuenca	262dc091ce	7589 Fix notifications shrink with avatar	2017-11-10 17:22:41 -07:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
Sam Gateau	f857b37d2e	Merge pull request #11758 from NissimHadar/hazeUIFix ... Improved Haze UI in Create menu	2017-11-10 11:58:06 -08:00
Brad Davis	92a3c209aa	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-10 11:44:29 -08:00
Melissa Brown	f7eb57a54c	Merge pull request #11653 from vladest/fix_sriptslog_multiply_window ... Fix scriptslog multiply window	2017-11-10 11:11:46 -08:00
Olivier Prat	103e036b70	Shadow maps rendered in cascades	2017-11-10 18:30:37 +01:00
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Dante Ruiz	ef55e3181d	moveing controllerDispatchaer pointers to pointerUtils.js	2017-11-09 16:48:52 -08:00
David Rowe	ad661cb345	Don't remove entities from list when try to delete locked entity	2017-11-10 10:50:07 +13:00
David Rowe	c53c356842	Display "no preview available" for ATP images in particles UI	2017-11-10 10:23:35 +13:00
Dante Ruiz	86439eff07	fixing merge conflict	2017-11-09 13:07:55 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
Clément Brisset	40baca6ee1	Merge pull request #11756 from ctrlaltdavid/21592 ... Fix import from URL adding multiple copies of imported entities	2017-11-08 18:01:48 -08:00
Nissim Hadar	7cb9514feb	Converted 'Glare Angle' control to a slider.	2017-11-08 16:50:44 -08:00
Nissim Hadar	5a56ea5894	Merge branch 'master' into hazeUIFix	2017-11-08 16:44:59 -08:00
Nissim Hadar	5c7ebc0af3	Converted 'Glare Angle' control to a slider.	2017-11-08 16:44:05 -08:00
Nissim Hadar	2920c6f9a9	Merge branch 'master' into hazeUIFix	2017-11-08 15:42:20 -08:00
Nissim Hadar	c1b5d00993	Converted 'Background Blend' control to a slider.	2017-11-08 15:41:24 -08:00
Zach Fox	33b6a13a4d	Revert 11728 and fix marketplace JS injection - should revisit	2017-11-08 15:21:36 -08:00
vladest	02625a6e28	Remove script from engine	2017-11-08 21:53:42 +01:00
vladest	5e32298183	Rework as script=only solution	2017-11-08 18:43:59 +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	91d8435a99	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-08 08:17:55 +01: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
Seth Alves	0edf056b78	Merge pull request #11755 from MidnightRift/patch-1 ... Fix controllerDispatcherUtils file path	2017-11-07 13:22:18 -08:00
Seth Alves	e22926eb89	Merge pull request #11762 from ctrlaltdavid/21594 ... Speed up entity list update after deleting entities	2017-11-07 09:34:47 -08:00
Seth Alves	ce7d0c324b	Merge pull request #11761 from ctrlaltdavid/21593 ... Don't move or rotate entities if Alt or Meta keys are pressed	2017-11-07 09:33:21 -08:00
Seth Alves	e9c0e53aa6	Merge pull request #11760 from druiz17/far-grab-parent ... Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID	2017-11-07 08:53:13 -08: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
David Rowe	fadbf09cdd	Avoid potentially slow entity list refresh upon deleting entities	2017-11-07 18:10:10 +13:00
Dante Ruiz	bdd31b63ed	update functions call names to match pointer API changes	2017-11-06 17:23:40 -08:00
Dante Ruiz	3e9eaa727b	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-06 16:39:10 -08:00
David Rowe	60319e8d53	Don't move or rotate entities if Alt or Meta keys are pressed	2017-11-07 13:35:31 +13:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
David Rowe	b272b2e6c8	Fix import from URL adding multiple copies of imported entities	2017-11-07 11:28:35 +13:00
Nissim Hadar	650df24761	Improved Haze UI in Create menu	2017-11-06 14:27:02 -08:00
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Midnight	e2ca3c6de0	Fix lib file path ... Changed the include to what should be the correct file path. it does not exist in the controllers folder.	2017-11-05 13:39:26 -07:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Olivier Prat	fcf1c301b6	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +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	4b598a6e24	Working stencil mask with object bounding boxes	2017-11-03 14:26:36 +01:00
Dante Ruiz	b6e3262164	removing the last remaining laserPointers	2017-11-02 11:31:13 -07:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
howard-stearns	76e06a6214	Update to stable-v-staging metaverse switching, to handle marketplace ... injection.	2017-11-01 15:28:28 -07:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -07:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Dante Ruiz	abb6f786fa	added homebutton message and scripts cleanup	2017-11-01 11:03:48 -07:00
Zach Fox	82816b5551	Merge pull request #11720 from zfox23/commerce_getToBuy ... Change 'GET' to 'BUY' when hovering over costed items	2017-11-01 09:49:39 -07:00
Dante Ruiz	cde5208151	fixing merge conflict	2017-11-01 08:56:55 -07:00
SamGondelman	5a7298f15b	Merge remote-tracking branch 'upstream/master' into pointers	2017-10-31 17:33:52 -07:00
Dante Ruiz	f44025a8b1	completely removed non-need laserPointers	2017-10-31 15:57:57 -07:00
Zach Fox	f9a410de87	Change 'GET' to 'BUY' when hovering over costed items	2017-10-31 14:53:37 -07:00
Dante Ruiz	30332c3d00	removing more laserPointers	2017-10-31 14:13:42 -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
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
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	1357877618	Replaced separate RGB components of colours with vec3's.	2017-10-30 12:41:09 -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	7e149fe30d	Remove unecessary comments	2017-10-27 15:18:50 -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
samcake	715cf301d5	cleaning the layout finally	2017-10-27 12:00:10 -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
Daniela	9dbe349867	Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos	2017-10-27 11:29:59 +01:00
Daniela	2ceba76ba2	yaw tool	2017-10-27 11:28:44 +01: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
Sam Gateau	a2765cffbd	adjusting the qml again ? i just hate the layout / anchor system	2017-10-26 23:22:06 -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
samcake	79338f4316	removing the the unecessary files and trying using qrc:///qml	2017-10-26 17:12:49 -07:00
Zach Fox	8cb60fc62c	Small edit.js changes	2017-10-26 16:44:21 -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	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
beholder	ddd25da430	8315 Stylus appears in wrong place on hand	2017-10-26 19:39:15 +03:00
Daniela	a1110bf28d	Rotations now happen using the correct axis taking into account the avatar referential	2017-10-26 16:52:58 +01:00
Olivier Prat	186b531be6	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-26 15:12:09 +02: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
samcake	5b0bbbb21e	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-25 13:14:47 -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
Olivier Prat	ae8a9e68c8	Added debug tool to view shadow & view frustums	2017-10-25 11:58:16 +02: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
Sam Gateau	f38fa14a39	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-24 21:00:44 -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
Olivier Prat	7011fd3731	Removed Mac and Ubuntu warnings	2017-10-23 15:46:11 +02:00
Olivier Prat	43f9db5b70	Fixed small bug due to half texel offset in outline shader	2017-10-23 11:08:13 +02:00
Olivier Prat	0f120a1a2a	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-23 10:08:02 +02:00
Sam Gateau	50a3ccdbca	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-21 10:01:07 -07: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
Olivier Prat	2d49cc1a75	Fixed bug in debugOutline script	2017-10-20 12:04:20 +02:00
Olivier Prat	732fe3b8db	Improved outline debugging script for easier test plan	2017-10-20 11:32:43 +02:00
Olivier Prat	8229c41622	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-20 09:59:07 +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
samcake	902334e1ec	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-19 12:04:01 -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
Olivier Prat	32df0209f3	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-19 17:38:05 +02:00
Olivier Prat	410b1904cd	Fixed bug in outline.qml that associated outline tab to wrong outline job config	2017-10-19 17:36:16 +02:00
Olivier Prat	fc66dcfdea	Added outline to statsGPU script	2017-10-19 16:52:29 +02: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
samcake	1d1651be25	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-18 18:26:25 -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
samcake	b29f276db3	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-18 16:42:30 -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
Olivier Prat	f63b4a64b0	Working debugging script with tabs	2017-10-18 16:02:38 +02:00
Olivier Prat	25b3549e04	Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled	2017-10-18 15:00:53 +02: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
Bradley Austin Davis	9e46e288b1	Merge pull request #11604 from SamGondelman/endSphere ... Scale LaserPointer end overlay in C++	2017-10-17 16:37:35 -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	afa93f46e5	Merge branch 'master' into hazeZone	2017-10-17 09:28:07 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
Olivier Prat	76589316df	Working debug script with multiple selection	2017-10-17 10:24:05 +02:00
Olivier Prat	9ed5185a3e	Multiple outline group config working	2017-10-17 10:01:06 +02:00
Sam Gateau	74b02a3e9b	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-16 20:58:11 -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
milad	97c255c59e	Fix for fogbugz:8382 to shutdown debug window on reload scripts	2017-10-16 16:12:54 -04: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
Olivier Prat	f716d0cc44	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-16 09:00:59 +02: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
Olivier Prat	2658d65814	Preparing for outline color mask	2017-10-13 12:02:21 +02:00
Sam Gateau	18287ed45b	Banging my head against qml...	2017-10-13 01:06:40 -07:00
samcake	8994200d01	Trying to integrate the tool scripts as an app	2017-10-12 17:57:30 -07:00
Nissim Hadar	b1174ce40c	Merge branch 'master' into hazeZone	2017-10-12 17:04:42 -07:00
Nissim Hadar	7eb9dade6a	Added hazeTestInitialPose.js	2017-10-12 17:03:33 -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
Olivier Prat	76305c5285	Better debugging options for bloom	2017-10-10 14:49:04 +02: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
Olivier Prat	0261265330	Working bloom but still visually unstable with geometry aliasing	2017-10-09 19:17:51 +02:00
Olivier Prat	98d39ff9e0	Merged with master	2017-10-09 09:37:18 +02:00
Olivier Prat	27a0fb62d3	Multiple gaussians as Unreal. First draft	2017-10-09 09:35:38 +02:00
Thijs Wenker	895f79fd80	Merge pull request #11548 from ctrlaltdavid/move-shapes ... Move Shapes app files from scripts directory to marketplace directory	2017-10-09 02:37:15 +02:00
Thijs Wenker	bd74386997	Merge pull request #11543 from ctrlaltdavid/21496 ... Add script that tests setting your listening position and orientation	2017-10-09 01:15:22 +02:00
David Rowe	765f3fc381	Move Shapes app files from scripts directory to marketplace directory	2017-10-09 10:38:40 +13:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
David Rowe	596ce8e9c1	Add script that tests setting your listening position and orientation	2017-10-07 21:46:56 +13: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
David Rowe	3fbaf250a4	Increase delay in kicking off physics	2017-10-07 11:50:31 +13:00
SamGondelman	b4a3ab9204	fix debugDeferredLighting	2017-10-06 15:46:10 -07: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
David Rowe	5c72a41163	Delete some redundant code	2017-10-06 11:14:07 +13:00
David Rowe	5587a2fdf8	Fix creating an entity while a tool is active	2017-10-06 11:13:53 +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
David Rowe	1673c08353	Update undo for grouping	2017-10-06 10:42:23 +13:00
Nissim Hadar	e15699192d	Added blend angle and altitude reference base.	2017-10-05 14:18:03 -07:00
David Rowe	21d286b422	Fix undo not coping with cloning with both hands simultaneously	2017-10-06 10:04:14 +13: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