1628 commits

Author	SHA1	Message	Date
Triplelexx	aa9a2532a9	fix for displaying "Bookmark Avatar" dialog in tablet ui	2017-03-30 13:54:33 +01:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Dante Ruiz	a76e5ef8d9	improve the design of the tablet goto	2017-03-28 23:02:23 +01:00
Seth Alves	48ea9acfb3	Merge pull request #10016 from druiz17/tablet-goto ... Porting goto to the tablet	2017-03-27 10:04:11 -08:00
Dante Ruiz	b8eac7abef	revoming useless code	2017-03-27 16:17:50 +01:00
Triplelexx	07e6b766b5	rename FILENAME constants	2017-03-26 23:10:50 +01:00
Triplelexx	dc64065668	Merge remote-tracking branch 'upstream/master' into 21224 ... update	2017-03-26 22:20:24 +01:00
Triplelexx	8f507942cf	change storage location ... still unsure what is best. this is consistent and doesn't require login	2017-03-25 19:10:12 +00:00
Triplelexx	c4bcacf0e0	use QueuedButton for upload dialog	2017-03-25 19:04:40 +00:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
humbletim	5d5d947ddb	updates per discussion with triplelexx	2017-03-25 04:01:02 -04:00
humbletim	630afb716f	consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin'	2017-03-25 03:01:35 -04:00
humbletim	96f905362b	alternative way to connect the button?	2017-03-25 01:17:27 -04:00
Dante Ruiz	2a59139c76	trying to fix focus issue	2017-03-25 01:17:37 +01:00
Dante Ruiz	9e2768cc84	saving work	2017-03-25 01:06:21 +01:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00:00
Dante Ruiz	119a71d0d1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto	2017-03-24 23:55:18 +01:00
Dante Ruiz	d9046a1982	goto on the tablet	2017-03-24 23:54:54 +01:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Dante Ruiz	a078121c46	saving work	2017-03-24 00:23:13 +01:00
Dante Ruiz	ae111ff2e9	Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto	2017-03-23 18:25:31 +01:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Vladyslav Stelmakhovskyi	fb0adae0b1	Scripts debug window in Tablet UI	2017-03-21 15:04:38 +01:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Faye Li	9cab8b6c4a	end of day commit	2017-03-20 17:04:29 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Faye Li	1d095b8158	added back forward and back button on nav bar	2017-03-20 15:57:59 -07:00
Faye Li	b6bf58d5be	rearrange layout of main tablet go to screen	2017-03-20 15:28:30 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Seth Alves	f48557b06b	Merge pull request #9943 from vladest/tablet-ui-login-logout ... Tablet ui login logout	2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi	5335bf8862	Menu items in Tablet UI now wrapped	2017-03-18 15:58:16 +01:00
Vladyslav Stelmakhovskyi	696825580e	Merge branch 'tablet-ui' into tablet-ui-login-logout	2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi	5e162a6447	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
Faye Li	33a7ff825e	indicate expecting json file on button text	2017-03-17 11:37:38 -07:00
Faye Li	6531efffbc	hook up qml button to edit.js	2017-03-17 11:22:07 -07:00
David Rowe	07e4b0ce41	Fix title menu icon getting stuck on white	2017-03-17 11:28:14 +13:00
David Rowe	069e66b875	Fix stack functions	2017-03-17 11:19:50 +13:00
David Rowe	f1947769d6	Fix tablet settings dialogs' titles and make QML consistent	2017-03-17 11:15:56 +13:00
David Rowe	1080e21afd	Tidying	2017-03-16 19:28:28 +13:00
David Rowe	89eb073855	Fix dialog height changing as drop-down value is changed	2017-03-16 19:28:12 +13:00
David Rowe	74db9dc573	Fix drop-down hiding behind buttons	2017-03-16 19:27:47 +13:00
David Rowe	3c1506237a	Fix not all warning text displaying	2017-03-16 19:27:27 +13:00