58348 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	ed5445ec51	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-21 13:09:41 -07:00
Chris Collins	52a850662c	Merge pull request #11219 from kencooke/interface-argv-bugfix ... Fix crashes caused by deleting argv while in use	2017-08-21 10:26:05 -07:00
Ken Cooke	099723fe4d	Use RAII to avoid deletion of extended argv while in use	2017-08-20 13:49:26 -07:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
Zach Fox	6e171d38ce	Bugfixes	2017-08-18 17:04:46 -07:00
Zach Fox	a07598c738	Bugfixes	2017-08-18 16:36:11 -07:00
Zach Fox	94da149ac8	Almost there	2017-08-18 16:28:02 -07:00
druiz17	42f6333948	Merge pull request #11206 from vladest/goto_remove_snap ... Switch off snap behavior	2017-08-18 16:14:59 -07:00
Zach Fox	c42a658bde	Almost-working change pages	2017-08-18 16:06:39 -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
anshuman64	a7090c7e07	Merge pull request #11211 from vladest/edit_clonable_lost ... Adopt cloneable settings to new styling	2017-08-18 15:37:37 -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
Chris Collins	2456126bcc	Merge pull request #11157 from SamGondelman/tabletLayer ... Render non-AA overlays correctly	2017-08-18 14:59:20 -07:00
Zach Fox	f28544e405	Show real balance	2017-08-18 14:53:55 -07:00
Liv	3406647966	Merge pull request #11203 from elisa-lj11/emoji ... Emoji Tablet App	2017-08-18 14:37:14 -07:00
Zach Fox	a91c0cb169	Add 'exchange' tab	2017-08-18 14:22:25 -07:00
Zach Fox	4ff1fb8df0	Filling out home	2017-08-18 14:18:05 -07:00
howard-stearns	29b717e22d	remove dead code	2017-08-18 14:08:04 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
Zach Fox	9636fad679	Updates from wireframes	2017-08-18 13:45:30 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
vladest	d29d4b5016	Adopt clonable settings to new styling	2017-08-18 21:44:44 +02:00
Zach Fox	1a62f60348	Commit early and often.	2017-08-18 11:30:25 -07:00
Zach Fox	ace1e00158	MOREEEE PROGRESS	2017-08-18 10:52:42 -07:00
Elisa Lupin-Jimenez	762f1a9c5c	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-18 10:49:51 -07:00
Elisa Lupin-Jimenez	65f876acf3	enabled version check	2017-08-18 10:49:40 -07:00
SamGondelman	c9f4958925	handControllerGrab fix, maybe, hopefully	2017-08-18 10:39:40 -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
Elisa Lupin-Jimenez	4c28b9f09a	attempt to check version of interface	2017-08-17 18:16:41 -07:00
Zach Fox	ccf81f801d	All the pieces!	2017-08-17 17:06:48 -07:00
Zach Fox	05648bdbcb	Passphrases working	2017-08-17 16:53:38 -07:00
Zach Fox	d052b49a54	Login and picture selection done	2017-08-17 16:34:33 -07:00
Zach Fox	5f69f30551	MOAR PROGRESS	2017-08-17 16:20:50 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Sam Gateau	5ac65e8f35	Merge pull request #11184 from Zvork/fadeinvertfix ... Fade edition bug fix	2017-08-17 15:10:50 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
vladest	f3969b0909	Switch off snap behavior	2017-08-17 22:28:42 +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
Elisa Lupin-Jimenez	4b1498f727	moved blocksApp.js to unpublished scripts, added icon	2017-08-17 10:18:29 -07:00
Elisa Lupin-Jimenez	a9d5cb45e9	changed icon to white	2017-08-17 10:11:29 -07:00
Elisa Lupin-Jimenez	930f163ca1	added app icon	2017-08-16 17:57:32 -07:00
Elisa Lupin-Jimenez	e032979794	a little cleanup	2017-08-16 17:33:14 -07:00
Elisa Lupin-Jimenez	bf35b08179	Emoji tablet app	2017-08-16 17:27:29 -07:00
Zach Fox	a4123e3024	Merge pull request #11201 from zfox23/sam_is_cool ... Allow users to take a snapshot from the Secondary Camera!	2017-08-16 17:03:15 -07:00
SamGondelman	ee74f6404e	put back FilterLayeredItems to make samcake happy	2017-08-16 16:08:38 -07:00
Chris Collins	9c9bcd80b8	Merge pull request #11191 from SamGondelman/logging ... Miscellaneous logging fixes	2017-08-16 15:46:32 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
Chris Collins	38e5c4fde0	Merge pull request #11200 from Atlante45/new-master ... Stable => Master	2017-08-16 13:34:38 -07:00