50078 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Seth Alves	439d6f0fa3	Merge pull request #9418 from druiz17/tabletController ... game controller input with tablet	2017-01-18 09:31:55 -08:00
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	715ee0b019	Merge pull request #9416 from sethalves/tablet-ui ... Tablet ui	2017-01-18 06:41:21 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
Seth Alves	d02ef9fb86	Merge pull request #9415 from hyperlogic/tablet-ui2 ... Adjusted tablet spawn position and orientation to be more natural	2017-01-18 06:36:18 -08:00
Seth Alves	3fe9505f18	Merge pull request #9414 from fayeli/menu-scrolling ... Fix tablet menu scrolling issue	2017-01-18 06:35:06 -08:00
Brad Hefta-Gaub	5036781b81	Merge pull request #9406 from jherico/atp_core_usage ... Consume fewer cpu cores in AssetServer when interface is running locally	2017-01-18 06:50:48 -06:00
Anthony J. Thibault	03f8a310fc	Fix for exception on script ending	2017-01-17 18:17:41 -08:00
Anthony J. Thibault	c6f3eb138a	Adjusted tablet spawn position and orientation to be more natural	2017-01-17 18:16:40 -08:00
Brad Davis	a593a2116a	Removing magic numbers	2017-01-17 18:15:40 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00
Faye Li Si Fi	d7209ef7f7	syntax	2017-01-17 16:56:54 -08:00
Faye Li Si Fi	42a96a94b4	fix	2017-01-17 16:54:40 -08:00
Faye Li Si Fi	126bfba512	fix tablet menu scrolling issue	2017-01-17 16:40:12 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -08:00
Seth Alves	c8382e6853	Merge pull request #9412 from fayeli/menu-fix ... Fixes for Tablet Menu Issues	2017-01-17 14:58:47 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00
Seth Alves	016d247fc8	Merge pull request #9411 from sethalves/tablet-ui-fix-other-camera-index ... Tablet ui fix other camera index	2017-01-17 13:34:36 -08:00
Seth Alves	be165b567e	remove XXX comments	2017-01-17 13:32:58 -08:00
Seth Alves	e76f1c5937	if another avatar has something hung from their camera, don't act like their camera is my camera	2017-01-17 13:28:13 -08:00
Seth Alves	89d7b8bfc6	call releaseEquip when an equipped entity is dropped with a secondary press	2017-01-17 13:27:01 -08:00
Ryan Huffman	d9e7c423f6	Merge pull request #9409 from birarda/granular-stats ... add 1s heartbeat interval command line switch	2017-01-17 13:21:42 -08:00
Faye Li Si Fi	20ac96a7f9	fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page	2017-01-17 12:29:38 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Faye Li Si Fi	965f9ab0a7	fix tapping menu when already at the top-level menu blanks the tablet	2017-01-17 11:58:48 -08:00
Zach Fox	246f5fb7f5	Add log; fix whitespace	2017-01-17 11:51:09 -08:00
Stephen Birarda	1e04aebb8d	add --fast-hearbeat command line switch for 1s stats	2017-01-17 11:25:40 -08:00
Seth Alves	0cc317d13b	Merge pull request #9408 from sethalves/tablet-ui-fix-unhook-loop ... avoid an unhook loop if two different hands have passed something bac…	2017-01-17 10:25:32 -08:00
Seth Alves	5c205f5800	avoid an unhook loop if two different hands have passed something back and forth more than once	2017-01-17 10:24:30 -08:00
Seth Alves	3d8b504ace	Merge pull request #9407 from sethalves/tablet-ui-upstream-merge ... Tablet ui upstream merge	2017-01-17 10:21:28 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
Seth Alves	1eb7b668bf	merge from upstream	2017-01-17 09:33:49 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
Philip Rosedale	b02a5f85ec	Merge pull request #9405 from ZappoMan/bugFix ... improve comment in domain settings	2017-01-16 20:47:43 -08:00
ZappoMan	5e49e8025a	improve comment in domain settings	2017-01-16 21:06:38 -06:00
David Kelly	6c07a9aece	remove debuggng logspam	2017-01-16 19:06:36 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Seth Alves	f900629cdb	Merge pull request #9390 from sethalves/load-models-in-keyhole ... fix physics not starting up when a model is close behind	2017-01-16 18:06:23 -08:00
Chris Collins	1df13d6a56	Merge pull request #9399 from howard-stearns/hand-controll-grab-update ... handControllerGrab update loop change	2017-01-16 16:41:02 -08:00