Commit graph

70973 commits

Author SHA1 Message Date
Cristian Luis Duarte
ccb5bae4b6 Android - People - Code review 2018-08-17 14:24:04 -03:00
John Conklin II
aa6ed008e1
Merge pull request #13835 from AndrewMeadows/less-avatar-flicker
fix for vanishing other avatars
2018-08-17 09:06:50 -07:00
Cristian Luis Duarte
4851b44de1 Android - People - Hide actions panel after remove 2018-08-16 19:39:44 -03:00
sabrina-shanman
b65572725d Merge branch 'master' into stt_performance 2018-08-16 14:44:58 -07:00
Andrew Meadows
90429f07cb don't forget to use enqueue the Transaction 2018-08-16 14:38:32 -07:00
David Rowe
5328b48acc Make Vive snap turn buttons lock teleport, also 2018-08-17 09:09:11 +12:00
David Rowe
bf733ded0f Handle Vive controller not being available at start-up 2018-08-17 09:08:28 +12:00
Cristian Luis Duarte
a3927f4d4c Android - People - Remove fragments and stack related logs 2018-08-16 17:31:31 -03:00
Cristian Luis Duarte
99760e2b40 Android - People - Better navigation after logged in prevents log in screen to appear after pressing back 2018-08-16 17:29:25 -03:00
John Conklin II
0c0ecd18c9
Merge pull request #13827 from amantley/newJumpWalkMotions
Replacing jump_takeoff.fbx and jump_land.fbx animations to fix transition to fly bug
2018-08-16 13:26:37 -07:00
John Conklin II
7f3bbaf3f8
Merge pull request #13755 from SimonWalton-HiFi/script-agent-destroy-engine
Fix for ScriptEngines not being released upon AC shutdown
2018-08-16 13:16:04 -07:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt
Fix potential reliable connection lockup.
2018-08-16 13:15:23 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
sabrina-shanman
130cb70a52 Do not create a reference to a shared pointer in CollisionPick.cpp 2018-08-16 10:39:13 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
sabrina-shanman
67ff05739a Take advantage of CollisionPickResult intersections being shared pointers to avoid copying on result comparison 2018-08-16 09:00:30 -07:00
sabrina-shanman
aa4a6b2eae Convert entityIntersections/avatarIntersections lists in
CollisionPickResult to shared pointers
2018-08-16 08:59:29 -07:00
Cristian Luis Duarte
a01b00b3d8 delete access token log 2018-08-16 12:36:25 -03:00
John Conklin II
22168e84af
Merge pull request #13828 from huffman/fix/synthesized-release-event-text
Fix functionality sometimes getting stuck if window loses focus (handshake, for instance)
2018-08-16 08:21:58 -07:00
John Conklin II
96fd4704ac
Merge pull request #13829 from huffman/fix/edit-zoom-stuck
Fix edit orbit camera getting stuck zooming
2018-08-16 08:21:31 -07:00
John Conklin II
cb3ad63f77
Merge pull request #13831 from huffman/fix/edit-not-populating
Force entity list tool to refresh when opened
2018-08-16 08:21:04 -07:00
David Rowe
8d1b947bbd Fix variable names 2018-08-16 13:35:36 +12:00
Cristian Luis Duarte
43b2a86224 Android - People - Make list refreshable 2018-08-15 21:36:11 -03:00
Cristian Luis Duarte
6f83c7bff0 Android - People - Show name of user to delete in confirmation 2018-08-15 21:01:42 -03:00
Cristian Luis Duarte
1a343c1c33 Android - People - Hide People menu if the user is not logged in 2018-08-15 20:57:04 -03:00
Cristian Luis Duarte
3217f61a53 Android - People - Visit Online connections working 2018-08-15 20:21:34 -03:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
Ryan Huffman
2f833f16d8 Force entity list tool to refresh when opened 2018-08-15 14:19:20 -07:00
Ryan Huffman
24af22a52f Fix edit orbit camera getting stuck zooming 2018-08-15 13:56:44 -07:00
Sam Gondelman
5f4f232602
Merge pull request #13604 from huffman/feat/oven-etc2
Add ETC2 support to Oven
2018-08-15 13:55:44 -07:00
Ryan Huffman
5d44877f56 Fix functionality sometimes getting stuck if window loses focus 2018-08-15 13:32:58 -07:00
Cristian Duarte
81e24bb28e Android - People - Remove connection (from People) working with API 2018-08-15 17:29:28 -03:00
sabrina-shanman
61d12923ea Do not copy list of collision pick contact points when filtering them 2018-08-15 11:12:50 -07:00
sabrina-shanman
83ededfd37 Pass collision filter flags into AllContactsCallback for more efficient collision filtering 2018-08-15 11:12:50 -07:00
Cristian Duarte
dd5bd0229a Android - People - Hide visit option if user is offline 2018-08-15 14:51:37 -03:00
Cristian Duarte
6b2de05065 Android - People - Bigger touch area for friend star 2018-08-15 14:50:53 -03:00
amantley
0a1a75f752 Merge remote-tracking branch 'upstream/master' into newJumpWalkMotions 2018-08-15 10:26:24 -07:00
amantley
8b5f96a023 removed spin2App.js 2018-08-15 10:23:40 -07:00
amantley
48e08276bf added new jump_takeoff and jump_land to fix the tposing in the transition to and from flying 2018-08-15 10:20:17 -07:00
John Conklin II
d1a80e57be
Merge pull request #13809 from birarda/feat/reliable-avatar-kill
make avatar kill packets from mixer reliable
2018-08-15 10:00:22 -07:00
Seth Alves
83718ca06d
Merge pull request #13746 from alexiamandeville/emoteIcon
updating emote app icon
2018-08-15 08:29:48 -07:00
David Rowe
2034162c76 Disable Vive teleport button if transitioning from direction button 2018-08-15 21:31:53 +12:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll
Auto scroll
2018-08-14 20:56:53 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831
FB16831 qml-related warnings in log
2018-08-14 16:40:07 -07:00
Roxanne Skelly
50b0a458ce Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled. 2018-08-14 16:32:56 -07:00
Cristian Luis Duarte
d20c386102 Android - People - Befriending working 2018-08-14 20:22:23 -03:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
2018-08-14 15:40:07 -07:00
Roxanne Skelly
5a8da4ce97 Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app 2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll 2018-08-14 15:27:22 -07:00
John Conklin II
a5bace4e4d
Merge pull request #13706 from ElderOrb/FB17062
use updated 'Last Legends: Male' from Mukul
2018-08-14 14:18:39 -07:00