58356 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	20b6cddc56	attempt to add active tablet button	2017-08-23 15:38:11 -07:00
druiz17	80eac56c4d	Merge pull request #11233 from jherico/threaded_overlay_edits ... Allow asynchronous editing of non-QML overlays	2017-08-23 09:45:01 -07:00
Brad Davis	0a5bef22fc	Allow asynchronous editing of non-QML overlays	2017-08-22 17:12:18 -07:00
Anthony Thibault	bb49bcdcfd	Merge pull request #11223 from ElderOrb/bigobj ... fix for 'C1128: number of sections exceeded object file format limit'	2017-08-22 16:36:49 -07:00
beholder	a1e0f31cd8	fix for 'C1128: number of sections exceeded object file format limit'	2017-08-23 00:24:09 +03:00
Chris Collins	06641ade94	Merge pull request #11228 from Atlante45/new-master ... Update master from stable	2017-08-22 13:29:51 -07:00
Atlante45	697aed2fa2	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-08-22 12:58:38 -07:00
Chris Collins	8474bfb550	Merge pull request #11227 from highfidelity/RC-52 ... Beta Release 52 - Includes up to Developer Release 7030	2017-08-22 12:57:17 -07:00
Stephen Birarda	9dfc74de57	always write rank ID to variant when present	2017-08-22 11:24:32 -07:00
vladest	b7a048c6ea	Adopt clonable settings to new styling	2017-08-22 11:23:55 -07:00
Chris Collins	8cab4435c9	Merge pull request #11224 from birarda/bug/group-clear ... always write rank ID to variant when present	2017-08-22 09:08:59 -07:00
Stephen Birarda	1eb7fb5b3d	always write rank ID to variant when present	2017-08-21 17:15:44 -07:00
Chris Collins	72bb52c7ed	Merge pull request #11046 from rickdaniels/21448 ... Address bug #21448 "Correctly Size Bounding Boxes for Polylines"	2017-08-21 15:32:22 -07:00
Chris Collins	fcd3a8bd22	Merge pull request #11204 from EagleJumpDev/hifi_eaglejumpdev ... Base requirements change : dev system must have at least 8GB of RAM.	2017-08-21 15:30:51 -07:00
Chris Collins	a85022bb93	Merge pull request #11216 from MidnightRift/emitterShouldTrail ... Change emitShouldTrail to emitterShouldTrail.	2017-08-21 15:29:05 -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
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
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
Midnight	5f162c0352	Change emitShouldTrail to emitterShouldTrail.	2017-08-18 15:10:58 -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
Liv	3406647966	Merge pull request #11203 from elisa-lj11/emoji ... Emoji Tablet App	2017-08-18 14:37:14 -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
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
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
Sam Gateau	5ac65e8f35	Merge pull request #11184 from Zvork/fadeinvertfix ... Fade edition bug fix	2017-08-17 15:10:50 -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
EagleJumpDev	d01ce27ebf	Merge branch 'master' of https://github.com/highfidelity/hifi into hifi_eaglejumpdev ... Test merge..... BUILD_WIN.md only change	2017-08-16 22:17:35 -07:00
EagleJumpDev	f54e028c19	Out of memory errors detected on systems with only 6GB of main memory. Maybe 8GB should be the minimimum?	2017-08-16 22:16:50 -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