118 commits

Author	SHA1	Message	Date
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
samcake	9fceaad38b	Merging with master	2017-12-04 14:20:10 -08:00
howard-stearns	16d6d8a361	Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:29 -08:00
howard-stearns	ca80c9b764	Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:08 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Sam Gateau	44f63ef802	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-18 08:23:59 -08:00
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
H Q	21a28827c9	Remaining coding style changes, other small fixes	2017-11-17 07:59:52 -08:00
samcake	08dd76c9a8	changes of the day	2017-11-16 17:52:12 -08:00
Sam Gateau	3a0b2651d5	Keep spinning on the bridge between js interface and the highlighting feature	2017-11-16 00:55:51 -08:00
Dante Ruiz	dd8ea759d4	fix tablet rez for commence button	2017-11-15 15:48:39 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
H Q	0db9e876d6	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet	2017-11-14 15:40:44 -08:00
H Q	44f2c92d30	Final ECSDA and nonce modifications for this dev cycle	2017-11-14 15:40:29 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -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	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
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
Olivier Prat	e0fd71f246	Merged from master	2017-11-03 14:39:42 +01: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
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	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
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
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 Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
Zach Fox	c217992866	Order of operations lol	2017-10-20 11:42:03 -07: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
Olivier Prat	e42699c0ea	Added multiple selections but still only first linked to outline	2017-10-16 10:57:06 +02:00
SamGondelman	c4e6cb28ce	move contextoverlay connection to contextoverlayinterface	2017-10-13 16:23:29 -07:00
SamGondelman	a48221d915	fix context overlays	2017-10-12 14:51:15 -07:00