50270 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
samcake	246dcbd0c0	Removing the warning	2017-01-17 15:01:27 -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
samcake	5ed3b48f9d	adding the checkbox to show the meta bounds from the debugDeferredLighting.js	2017-01-17 12:15:09 -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
samcake	69f9053e61	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-17 10:55:10 -08:00
samcake	305e308575	avoiding the exclusive filtering behavior	2017-01-17 10:54:45 -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
humbletim	7025ed5909	update test script to create a triggerable entity	2017-01-17 03:18:56 -05:00
humbletim	88b7f9ec9d	add ambient sound test	2017-01-17 01:44:03 -05:00
humbletim	27a2367634	update debugPrints	2017-01-17 01:27:48 -05:00
humbletim	c7a561aff9	trim extra debugging code	2017-01-17 01:23:03 -05: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
samcake	960f4f0ead	Move the drawBOunds job to DrawTasks	2017-01-16 18:33:42 -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
samcake	0b9b5d595c	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-16 17:48:16 -08:00
samcake	83d1c3ad01	Adding support for the meta rendering	2017-01-16 17:47:58 -08:00
humbletim	827aa68d3f	cleanup pass	2017-01-16 19:50:25 -05: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
humbletim	c9fd650e70	update to support click/far-click toggling and userData.disabled setting	2017-01-16 19:37:31 -05:00
David Rowe	a1fe908380	Remove a lingering line of old code	2017-01-17 12:56:56 +13:00
Chris Collins	5f34ad3596	Merge pull request #9400 from AndrewMeadows/fix-cauterization-hack ... don't render non-skinned meshes on head when in first person	2017-01-16 15:47:52 -08:00
Zach Fox	1e8effdcc4	Packet verison bump	2017-01-16 15:28:53 -08:00
Zach Fox	e72c25736e	Cleanup	2017-01-16 15:21:18 -08:00
Andrew Meadows	fd28457807	fix cauterization hack	2017-01-16 15:13:28 -08:00
howard-stearns	0a3236dcc9	handControllerGrab update loop change	2017-01-16 14:54:32 -08:00
Zach Fox	e98a40c30e	Does this work?	2017-01-16 14:43:30 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	079e5c4296	Merge pull request #9397 from zfox23/FB-2814 ... Fix FB-2814 "Users.requestUsernameFromID() doesn't work for yourself"	2017-01-16 12:54:28 -08:00