3236 commits

Author	SHA1	Message	Date
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00
druiz17	42f6333948	Merge pull request #11206 from vladest/goto_remove_snap ... Switch off snap behavior	2017-08-18 16:14:59 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
howard-stearns	6e34ab45d6	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2	2017-08-18 10:03:33 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	4eba09214c	Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item	2017-08-18 08:11:29 +02:00
vladest	f3969b0909	Switch off snap behavior	2017-08-17 22:28:42 +02:00
vladest	855f9d8a95	Missed qml file added	2017-08-17 21:47:48 +02:00
vladest	f77b913a14	Added input meter	2017-08-17 20:55:00 +02:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
vladest	1a32a6fac3	Merge branch 'master' into audio_devices_split	2017-08-17 17:20:11 +02:00
vladest	d6c426d064	Reworking according new design	2017-08-17 17:17:02 +02:00
Chris Collins	9c9bcd80b8	Merge pull request #11191 from SamGondelman/logging ... Miscellaneous logging fixes	2017-08-16 15:46:32 -07:00
vladest	2cca584e58	Merge branch 'master' into audio_devices_split	2017-08-16 22:47:06 +02:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
Zach Fox	2fa1bd25a8	Clipping and mipping!	2017-08-15 16:45:46 -07:00
Zach Fox	984a5aea2c	You can now spawn infinite copies of items you've previously purchased	2017-08-15 16:32:23 -07:00
Zach Fox	5c157a7397	Move security image to top left	2017-08-15 16:24:14 -07:00
Zach Fox	ccf2d71036	V1 done	2017-08-15 16:11:34 -07:00
Zach Fox	29a9ae28e9	Fixes	2017-08-15 15:36:28 -07:00
Zach Fox	768eb7f91c	Getting closer	2017-08-15 15:02:28 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	21cef482a5	Merge pull request #11190 from druiz17/fix-table-dialog ... Fixed unable to select items in a TreeView	2017-08-14 17:05:42 -07:00
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
Zach Fox	823f2fb252	Merge pull request #11181 from cain-kilgore/skybox-changer ... WL 21447 - Create a Skybox Changer	2017-08-14 15:08:03 -07:00
Cain Kilgore	e7a4bff705	Made Changes per Review, added js	2017-08-14 22:47:18 +01:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
Cain Kilgore	28c81534c4	Updated Text at Top	2017-08-14 05:11:53 +01:00
vladest	b22745d57a	Fix binding loops	2017-08-12 12:52:35 +02:00
Cain Kilgore	8c9f3ae977	Skybox Changer PR	2017-08-12 01:35:48 +01:00
Zach Fox	0835b7b8e6	Bugfix	2017-08-11 16:36:26 -07:00
Zach Fox	d8e5f7a067	Small improvements	2017-08-11 16:32:35 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	9120e678f1	Use asynchronous commerce API	2017-08-11 16:17:13 -07:00
howard-stearns	d7f83a2fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 15:53:53 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
vladest	af39b5660b	Merge branch 'master' into audio_devices_split	2017-08-11 20:42:49 +02:00
vladest	560696e41c	Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2	2017-08-11 20:39:17 +02:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00