1431 commits

Author	SHA1	Message	Date
Dante Ruiz	93ae93a45a	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-23 15:43:24 +00:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Seth Alves	5bff2034c3	cleanups, attempt to get particle explorer to work right	2017-02-22 12:07:18 -08: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
Anthony J. Thibault	379b7bc56d	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Dante Ruiz	3f8ea4ac54	fixed merge conflict	2017-02-17 23:33:39 +00:00
Anthony J. Thibault	5963c6ddc3	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
Dante Ruiz	dedd85d296	saving work	2017-02-17 18:47:59 +00:00
Seth Alves	0d10667bb4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-17 09:58:33 -08:00
Dante Ruiz	08ffa18008	Merge branch 'master' into menuFix	2017-02-17 15:53:33 +00:00
Dante Ruiz	3189b44612	refreshing with master	2017-02-17 15:50:08 +00:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -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
Anthony J. Thibault	5b1f150171	Fix for race condition when switching between Main Menu and Audio Menu	2017-02-16 12:52:46 -08:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00
Dante Ruiz	b50bc99cbd	updated menu stack	2017-02-16 08:13:16 -08:00
Dante Ruiz	2a97ebb076	updating branch with master	2017-02-16 08:11:50 -08:00
Anthony J. Thibault	03b6280ed0	Fix for empty toolbar issue	2017-02-15 16:50:08 -08:00
Anthony J. Thibault	67302cbd2b	toolbar work to better support tablet buttons	2017-02-15 15:53:08 -08:00
Anthony J. Thibault	ed11edad56	EventBridge support	2017-02-15 13:59:04 -08:00
Dante Ruiz	e6853a9255	updated menu stack	2017-02-15 18:57:06 +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	912e8aa04a	Tablet buttons now work in toolbar. ... Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.	2017-02-14 15:37:24 -08:00
Anthony J. Thibault	4503923665	Initial version of TabletProxy.toolbarMode boolean ... Copies all tablet buttons between the tablet and the system toolbar. To test type this in the console: Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;	2017-02-14 15:36:03 -08:00
Seth Alves	838d7f6f10	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 13:58:18 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Dante Ruiz	968ba1e03d	updated file headers	2017-02-14 16:08:25 +00:00
Dante Ruiz	aa164bbf8f	diff minimize	2017-02-14 15:55:32 +00:00
Dante Ruiz	9d5f392be3	removed more qml log errors	2017-02-14 07:46:34 -08:00
Dante Ruiz	773ade5b61	removing qml errors	2017-02-14 07:46:34 -08:00
Dante Ruiz	8fbcead6d1	removed/renamed some files	2017-02-14 07:46:33 -08:00
Dante Ruiz	948352cdb6	general preferences work on tablet	2017-02-14 07:46:33 -08:00
Dante Ruiz	888d4ff706	basic prefreneces done	2017-02-14 07:46:32 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	d40402faae	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 06:53:34 -08:00
Anthony J. Thibault	1c783031b1	Removed ColorOverlay from TabletButton, added more icon & text states ... Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images. * icon * hoverIcon * activeIcon * activeHoverIcon * text * hoverText * activeText * activeHoverText Updated scripts to set new button states, if necessary.	2017-02-13 15:09:46 -08:00
David Rowe	77f0fb1491	Change the "Mute" tablet button to "Audio"	2017-02-11 22:40:19 +13:00
kunalgosar	9c537726e5	Fix stuck in pause error with browsers	2017-02-10 18:13:09 -08:00
David Rowe	a08347936e	Make clicking the tablet mic icon or audio bar toggle the mute state	2017-02-11 15:11:27 +13:00
Seth Alves	44aa3e044b	make it so near grabbing while edit is active doesn't select a new entity	2017-02-10 16:56:53 -08:00
Seth Alves	fead52f626	put new-entity buttons in a tab of the edit app	2017-02-10 15:18:01 -08:00
David Rowe	acaf8c69c6	Better tablet mic muted and unmuted iconography	2017-02-11 11:07:31 +13:00
Seth Alves	0b358a2ac7	finish hooking up new-model dialog	2017-02-10 13:29:06 -08:00
David Rowe	b5b92c1508	Make the tablet's mic icon reflect the current mute state	2017-02-11 09:53:02 +13:00
Seth Alves	e851ece343	merge from upstream	2017-02-10 12:09:00 -08:00