19079 commits

Author	SHA1	Message	Date
Olivier Prat	f996435ac8	Merge branch 'master' of git://github.com/highfidelity/hifi into highlight	2017-11-08 11:41:21 +01: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
Dante Ruiz	c9d67f762b	made requested changes	2017-11-06 16:20:16 -08:00
Dante Ruiz	067ed2ffe0	apply coding standard	2017-11-06 16:09:31 -08:00
Dante Ruiz	646e5455ac	forgot to remove unused variable	2017-11-06 16:05:44 -08:00
Dante Ruiz	41c6261b74	LaserPointer: made _objectLockEnd into a struct	2017-11-06 16:04:33 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Zach Fox	bb21c52783	Fix crash when logging out while Passphrase screen visible	2017-11-06 15:12:01 -08:00
Dante Ruiz	e432e62a39	Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent	2017-11-06 09:02:03 -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
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Zach Fox	c496429a85	Add Machine Fingerprint to receive_at endpoint txn'	2017-11-03 10:40:25 -07:00
John Conklin II	ff36cbf45f	Merge pull request #11731 from sethalves/fix-ignore ... stop drawing ignored avatars, even if PAL is still open	2017-11-03 09:45:03 -07:00
Olivier Prat	e0fd71f246	Merged from master	2017-11-03 14:39:42 +01:00
Zach Fox	6173ad810b	Reset wallet passphrase when login username changes	2017-11-02 15:48:59 -07:00
Zach Fox	23e627a46f	Send empty decrypted text if impossible to decrypt	2017-11-02 13:46:24 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Zach Fox	f8718efe25	Fix warnings	2017-11-02 09:42:33 -07:00
Olivier Prat	e9743d4c95	Added jsdoc to SelectionScriptingInterface	2017-11-02 10:00:30 +01:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
Seth Alves	12792c3821	stop drawing ignored avatars, even if PAL is still open	2017-11-01 17:26:00 -07:00
Zach Fox	72d61f1825	Remove unnecessary log - static verif isn't working	2017-11-01 12:03:44 -07:00
Zach Fox	56cb98d96f	Make inspection cert work	2017-11-01 12:02:57 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
Zach Fox	d49e281fab	Add RSA error handling	2017-10-31 14:12:30 -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
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
Andrew Meadows	f958829d00	Merge pull request #11708 from samcake/blue ... Expose the Render api to the tablet js context and update render engine tool	2017-10-27 17:12:36 -07:00
Brad Hefta-Gaub	8322631a6d	Merge pull request #11695 from luiscuenca/case6719 ... 6719 Avatar attachment window will update when attachments are modified	2017-10-27 17:01:05 -07:00
samcake	8a3b1a20cc	merge with upstream	2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub	d61ede2a4e	Merge pull request #11697 from ElderOrb/FB8211 ... 8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-27 13:26:41 -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
Zach Fox	3fae121335	Merge pull request #11670 from zfox23/stagingSetting ... Make it easier to switch between STABLE and STAGING Metaverses	2017-10-27 12:03:29 -07:00
samcake	55f6ecb070	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-27 09:29:41 -07: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
samcake	0636a2db06	removing historic changes	2017-10-26 19:19:52 -07:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
samcake	b9112024b8	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-26 14:27:23 -07:00
SamGondelman	755ce183e0	fix is facing avatar	2017-10-26 14:16:31 -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