16767 commits

Author	SHA1	Message	Date
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Clément Brisset	eba6a8f028	Merge pull request #9674 from Atlante45/fix/mac-macro ... Fix SSE2 macros for Macs	2017-02-15 11:29:55 -08:00
kunalgosar	4579ac4998	Changed button margin	2017-02-14 16:43:55 -08:00
kunalgosar	91a73b2689	Button styling	2017-02-14 16:13:40 -08:00
kunalgosar	5e5d76ead7	Implemented toggle prev search button	2017-02-14 16:13:40 -08:00
kunalgosar	c01d0b309e	Toggle next for search on Log	2017-02-14 16:13:40 -08:00
Anthony J. Thibault	5e25d073f3	WIP commit	2017-02-14 15:36:01 -08:00
Atlante45	1201932ee9	Fix SSE2 macros for Macos	2017-02-14 14:10:53 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Seth Alves	e323971062	Merge pull request #9671 from druiz17/general ... Moved general preference settings to the tablet	2017-02-14 10:11:33 -08:00
Brad Hefta-Gaub	f433347362	Merge pull request #9652 from sethalves/avatar-as-child-fixes ... some fixes for when an avatar is a child of something else	2017-02-14 09:07:47 -08:00
Dante Ruiz	888d4ff706	basic prefreneces done	2017-02-14 07:46:32 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	ba025d44e0	Merge pull request #9642 from AndrewMeadows/beware-humbletim ... fix performance problem for invalid "avatarEntityData"	2017-02-14 06:33:48 -08:00
Seth Alves	2e2a3c60d0	Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes	2017-02-14 06:26:20 -08:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
Seth Alves	bc5f563f57	make _parentID and _parentJointIndex private to avoid accidental direct access	2017-02-12 11:37:29 -08:00
Seth Alves	1164a1b3bf	some fixes for when an avatar is a child of something else	2017-02-12 08:27:39 -08:00
Kunal Gosar	c3f2f5779a	fix if else syntax	2017-02-11 15:46:49 -08:00
Kunal Gosar	975d844eee	syntax fix	2017-02-11 15:01:02 -08:00
Kunal Gosar	18e776bd29	emit signal only on change	2017-02-11 13:58:23 -08:00
kunalgosar	9c537726e5	Fix stuck in pause error with browsers	2017-02-10 18:13:09 -08:00
David Rowe	a08347936e	Make clicking the tablet mic icon or audio bar toggle the mute state	2017-02-11 15:11:27 +13:00
kunalgosar	691f61983a	added isAway property to MyAvatar	2017-02-10 17:28:12 -08:00
Andrew Meadows	d2315c15a1	avoid duplicate parse of AvatarEntityData entries	2017-02-10 13:14:20 -08:00
Andrew Meadows	563bf65e89	fix bug: performance problem for avatarEntities	2017-02-10 13:14:20 -08:00
Andrew Meadows	ee702f945f	cleanup around when to send identityPacket	2017-02-10 13:14:20 -08:00
Atlante45	3a30de79aa	CR	2017-02-09 13:04:43 -08:00
Atlante45	72ed1add94	CR log spam cleanup	2017-02-09 13:04:43 -08:00
Atlante45	6fbe3c9187	Windows specific changes	2017-02-09 13:04:43 -08:00
Atlante45	43d2501993	Add HMD friendly window for the ESS log	2017-02-09 13:04:43 -08:00
Atlante45	0f39356e94	Only users with perm rez can see the log	2017-02-09 13:04:43 -08:00
Atlante45	35f8afe456	Handle domain reconnections	2017-02-09 13:04:43 -08:00
Atlante45	191121888c	Add log window to the ESS log	2017-02-09 13:04:43 -08:00
Atlante45	2962dd6dc2	Factor LogDialog	2017-02-09 13:04:43 -08:00
Atlante45	fcb74bce10	First draft for entity script server log streaming	2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub	74f10a1e7f	Merge pull request #9603 from huffman/feat/trace-thread-script ... Add thread names and scripts to chrome traces	2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub	bc22326ec8	Merge pull request #9640 from ZappoMan/avatarSimulationStats ... New stats for avatar simulation	2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub	bb4654506a	CR	2017-02-09 11:37:21 -08:00
Brad Hefta-Gaub	57e0dadd65	CR	2017-02-09 11:35:00 -08:00
samcake	850be620f9	Merge pull request #9606 from samcake/blue ... More intrumentation, Pixel Format clean up and minor improvments in texture transfers	2017-02-09 11:18:09 -08:00
Seth Alves	b34341b48e	Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos ... Remove avatarEntityData cruft from settings	2017-02-09 10:40:00 -08:00
Brad Hefta-Gaub	dd2ddcc291	cleanup	2017-02-09 09:57:32 -08:00
Brad Hefta-Gaub	ae071aec0d	add a bunch more stats for avatar processing	2017-02-09 09:52:09 -08:00
samcake	c62108c3c8	Resolve merging conflict	2017-02-09 09:49:59 -08:00
Dante Ruiz	5c5ace7c7b	goto in tablet	2017-02-09 07:13:29 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Seth Alves	908df7ee8a	Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs ... Fix for hidden cursor while using Export Entities / Import Entities form	2017-02-08 19:42:33 -08:00