1459 commits

Author	SHA1	Message	Date
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
Dante Ruiz	16d3f22e77	remove uncommented code	2017-02-28 21:39:33 +00:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00: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	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
Dante Ruiz	89f5e5112f	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-24 15:25:32 +00:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Seth Alves	57ab2ba7ca	Merge pull request #7 from fayeli/edit-js-create-tab ... Create Tab and Tab Bar QML Styling	2017-02-23 17:40:48 -08:00
Faye Li	c60360b6e0	particle explorer icon	2017-02-23 16:34:10 -08:00
Dante Ruiz	4a5be4238e	messages and file dialogs in tablet	2017-02-24 00:19:32 +00:00
Faye Li	80c3c00398	switch to properties tab when you create an entity	2017-02-23 14:48:06 -08:00
Faye Li	d4ea0c116d	asset server button	2017-02-23 14:36:39 -08:00
Faye Li	3850bc35a9	icons on new entity buttons	2017-02-23 13:31:03 -08:00
Faye Li	bd834097d5	tab bar styling	2017-02-23 12:36:27 -08:00
Faye Li	8e89e07732	text choose an entity type to create	2017-02-23 11:50:39 -08:00
Faye Li	88318c1911	create tab background and new entity buttons	2017-02-23 11:40:26 -08:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -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
Andrew Meadows	6ac33dbf61	count avatar joint updates and non-updates	2017-02-22 17:23:36 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
howard-stearns	de3a0d3d0c	button styling	2017-02-22 13:02:05 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08: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
howard-stearns	a20590a2f9	fixed myCard width in all cases (admin or not)	2017-02-21 16:03:59 -08:00
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
howard-stearns	f21e17d512	new buttons	2017-02-21 15:32:41 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -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