5699 commits

Author	SHA1	Message	Date
David Rowe	b9869264ba	Display avatar settings dialog in tablet	2017-03-02 13:16:23 +13:00
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Seth Alves	8110921abf	git rid of _mouseToOverlays until I remember why I thought I needed it	2017-02-27 11:11:04 -08:00
Ryan Huffman	5b59939195	Merge pull request #9602 from huffman/feat/shortbow-entity-server ... Add shortbow to marketplace scripts	2017-02-27 11:09:52 -08:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Seth Alves	a2f527b28a	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-25 08:44:03 -08:00
Seth Alves	36bcaa8d0f	delete tablet overlays when switching domains	2017-02-25 08:43:06 -08:00
kunalgosar	d6c1f1c99a	Fixed Wed Entity not leaving Focus	2017-02-24 18:18:48 -08:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Dante Ruiz	93ae93a45a	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-23 15:43:24 +00:00
Seth Alves	41ef7b8dbb	add setting to control if tablet is an entity or overlay	2017-02-22 21:13:42 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Seth Alves	84b93826d0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
Seth Alves	1d446064be	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 08:23:36 -08:00
Seth Alves	3b181eb803	code review	2017-02-21 13:56:28 -08:00
Dante Ruiz	f58a018c64	fixing merge conflicts	2017-02-21 15:46:41 +00:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Seth Alves	ea03f41b57	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-18 10:32:11 -08:00
Chris Collins	ec07969c0b	Merge pull request #9703 from kunalgosar/logDisplayMode ... Logging HMD/Desktop Transitions	2017-02-17 17:07:02 -08:00
Seth Alves	def669364b	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 15:45:19 -08:00
Seth Alves	d7bb6f105b	make tablet part IDs available through qApp	2017-02-17 15:43:20 -08:00
Dante Ruiz	3f8ea4ac54	fixed merge conflict	2017-02-17 23:33:39 +00:00
kunalgosar	b8b5927351	Logging display mode changes	2017-02-17 13:21:01 -08:00
Dante Ruiz	dedd85d296	saving work	2017-02-17 18:47:59 +00:00
Seth Alves	4c1f5c1dc8	Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-17 09:58:58 -08:00
Dante Ruiz	80551cf0dd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-17 15:50:27 +00:00
Dante Ruiz	3189b44612	refreshing with master	2017-02-17 15:50:08 +00:00
Seth Alves	05c135b9d8	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
Seth Alves	c1e41311fc	working toward using uuids for overlay IDs	2017-02-16 17:18:09 -08:00
Dante Ruiz	628b97bfc6	fixed merge issues	2017-02-17 00:08:31 +00:00
Dante Ruiz	afd56bbbbe	fixed qml font path issue for desktop and tablet	2017-02-17 00:01:12 +00:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
Dante Ruiz	7ad8a389f6	refreshing with master	2017-02-16 08:13:17 -08:00
Dante Ruiz	2a97ebb076	updating branch with master	2017-02-16 08:11:50 -08:00
Dante Ruiz	896f9d7181	refreshing with master	2017-02-16 15:58:26 +00:00
Dante Ruiz	485592751f	fixing merge changes	2017-02-15 15:38:22 +00:00
Dante Ruiz	22baab1359	updating branch with master	2017-02-15 15:24:08 +00:00
Anthony J. Thibault	5e25d073f3	WIP commit	2017-02-14 15:36:01 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Seth Alves	ba025d44e0	Merge pull request #9642 from AndrewMeadows/beware-humbletim ... fix performance problem for invalid "avatarEntityData"	2017-02-14 06:33:48 -08:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00