Commit graph

53481 commits

Author SHA1 Message Date
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
Chris Collins
e789492b34 Merge pull request #10212 from AndrewMeadows/avoid-invisible-avatars-003
avoid invisible avatars when source interface stops sending updates to avatar-mixer
2017-04-14 09:25:20 -07:00
Chris Collins
1eb3c5273f Merge pull request #10217 from sethalves/enable-grab-debug-prints
turn on handControllerGrab debug prints
2017-04-14 09:15:28 -07:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
Andrew Meadows
5bdecfbfa0 send keep-alive packets but don't resend identity 2017-04-13 16:00:11 -07:00
Andrew Meadows
14b60165ef don't keep stale avatars alive 2017-04-13 14:55:08 -07:00
Andrew Meadows
63ea16f24b avatar-mixer to send identity packets as 'reliable' 2017-04-13 13:37:18 -07:00
Andrew Meadows
e364b8d33e avatar-mixer resends to avoid stale avatar 2017-04-13 13:35:59 -07:00
Zach Fox
f23f9ec698 Merge pull request #10207 from zfox23/gifShareImprovements
Snapshot sharing improvements
2017-04-12 16:33:44 -07:00
Zach Fox
631033dcb5 Merge pull request #10209 from zfox23/fixUserInfoViewerButton
Make userInfoViewer button always clickable for myCard
2017-04-12 16:33:05 -07:00
Zach Fox
71caf85a27 Quick fix! 2017-04-12 14:57:44 -07:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter
Kinect hand filter
2017-04-12 14:27:05 -07:00
Chris Collins
c545558b8a Merge pull request #10199 from AndrewMeadows/avatar-should-vanish
Avatar should vanish when teleporting far away
2017-04-12 12:28:46 -07:00
Chris Collins
36797d08fe Merge pull request #10200 from thoys/fix/TeleportCoolIn
Fix teleport coolIn
2017-04-12 11:57:08 -07:00
Zach Fox
ef2cea0d63 Merge pull request #10203 from zfox23/fix/avatarMouthsMoving
Make avatar's mouths move again
2017-04-12 11:36:03 -07:00
Zach Fox
39587d5308 lol 2017-04-12 10:54:28 -07:00
David Kelly
a12407ddda Merge pull request #10202 from davidkelly/dk/3934
Connection sort change
2017-04-12 10:42:04 -07:00
David Kelly
058a5b14a4 damn linter didn't run - vimrc work ahead... 2017-04-12 10:22:40 -07:00
David Kelly
9376ac646f offline people sort change 2017-04-12 08:41:36 -07:00
Thijs Wenker
695c55bc3d fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes 2017-04-12 03:44:24 +02:00
Andrew Meadows
b8a3c856be update model transform even when out of view 2017-04-11 15:03:11 -07:00
Andrew Meadows
d25c0ace44 AvatarMixer sends min updates for out-of-view avatars 2017-04-11 15:02:27 -07:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix
snapshot bug fixes
2017-04-11 13:00:46 -07:00
Chris Collins
c86acfafef Merge pull request #10120 from huffman/feat/stick-default-avatar
Change default avatar to ball and stick avatar
2017-04-11 12:56:25 -07:00
samcake
5daf365784 Avoiding warning maybe 2017-04-11 12:15:30 -07:00
Seth Alves
f555ae253f Merge pull request #10192 from druiz17/tablet-webview-fix
webview go back to previous page fix
2017-04-11 12:11:43 -07:00
Chris Collins
3a603e7ced Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject
change handling of life-time of TabletProxy QObjects
2017-04-11 11:53:47 -07:00
Zach Fox
6569de697d Merge pull request #10187 from zfox23/fix/getAvatar_Fix
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
samcake
612acbc6d5 Avoid pointers on temp var 2017-04-11 10:56:58 -07:00
Seth Alves
077a4fe4ae change handling of life-time of TabletProxy QObjects 2017-04-11 10:56:47 -07:00
Dante Ruiz
9c79e62004 webview-fix 2017-04-11 18:49:40 +01:00
samcake
79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-11 10:00:34 -07:00
druiz17
b7daf8c80b Merge pull request #10191 from sethalves/fix-collision-hull-munging
fix -- munge collision-hull at last minute rather than store munged url as a property
2017-04-11 09:09:54 -07:00
Chris Collins
836b4993cc Merge pull request #10188 from druiz17/homebutton-fix-crash
fix crashes when clicking in the homebutton
2017-04-11 09:00:35 -07:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Seth Alves
d5f5192954 Merge pull request #10174 from vladest/fix-snapshot-login-cancel
Check if dialog was opened from StackView and then pop or just go to …
2017-04-11 07:07:29 -07:00
Seth Alves
bf16309917 Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002
avoid invisible avatars redux
2017-04-11 07:07:03 -07:00
Seth Alves
938fab6f59 Merge pull request #10061 from humbletim/fix-cached-ResourceCache
Fix cached ResourceCache::prefetch() state updates
2017-04-11 07:04:06 -07:00
Seth Alves
b99959c73d munge collision-hull at last minute rather than store munged url as a property 2017-04-11 07:00:22 -07:00
Sam Cake
1dd98af1dd And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue) 2017-04-11 01:21:45 -07:00
Sam Cake
80c781bcdc Fixing warning on mac and more description of the Task class 2017-04-10 22:17:12 -07:00