Commit graph

70760 commits

Author SHA1 Message Date
David Rowe
5e7f68d4b7 Use a smaller near grab radius for tablet and mini-tablet 2018-08-21 14:00:20 +12:00
David Rowe
8a8bf6dc04 Reduce default size of tablet in HMD mode 2018-08-21 10:49:19 +12:00
David Rowe
69e5eb9b1c Move tablet towards fingertips as it expands 2018-08-21 10:46:48 +12:00
David Rowe
dc86230e40 Make "..." expand tablet per display hand rather than centered 2018-08-21 10:33:13 +12:00
David Rowe
f4a8dc49e9 Add button sounds 2018-08-21 10:28:23 +12:00
David Rowe
4268297769 Mini tablet button actions 2018-08-21 09:17:53 +12:00
David Rowe
6791d3f1b6 Mini tablet button icons and states 2018-08-21 08:36:04 +12:00
David Rowe
4e23caf46d Fix tablet proper not being grabbed once mini tablet has expanded 2018-08-20 17:57:59 +12:00
David Rowe
ff54516790 Maintain overlays ready for display in HMD mode 2018-08-20 17:46:07 +12:00
David Rowe
aca343330f Base UI elements 2018-08-20 16:00:02 +12:00
David Rowe
94041291d5 Add web3d overlay for UI surface 2018-08-20 10:58:01 +12:00
David Rowe
2c389af751 Display mini tablet only if camera is also looking at the hand 2018-08-17 16:18:22 +12:00
David Rowe
846f38584f Merge branch 'master' into M17428 2018-08-17 15:01:35 +12: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
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
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
40f7914aae Expand from lower left/right of proxy tablet 2018-08-16 19:11:03 +12:00
David Rowe
7a1a86f182 Expand proxy tablet immediately it is grabbed; grab with either hand 2018-08-16 16:20:28 +12:00
David Rowe
cb9b7f567a Move update functions into state machine 2018-08-16 16:08:36 +12:00
David Rowe
cd70c97e90 Add tablet rezzer script to default scripts 2018-08-16 10:58:14 +12:00
David Rowe
a86fdeafc0 Merge branch 'master' into M17248-a 2018-08-16 10:38:30 +12: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
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
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
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
John Conklin II
007652632c
Merge pull request #13724 from gcalero/android_audio_fixes3
Android audio tests
2018-08-14 13:57:59 -07:00
Ryan Huffman
19f27ec911
Merge pull request #13810 from ctrlaltdavid/M11360
Don't auto-action entry in HMD file dialog when single-click
2018-08-14 12:57:28 -07:00
John Conklin II
8c5344ad1a
Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
2018-08-14 11:37:33 -07:00
Alexander Ivash
4478733c27 fix coding conventions 2018-08-14 21:18:54 +03:00
Seth Alves
dce7b6eae6
Merge pull request #13714 from sabrina-shanman/safe-teleport-target
Create CollisionPick API
2018-08-14 09:56:51 -07:00
Seth Alves
41e9c3a2ad
Merge pull request #13820 from AndrewMeadows/dont-try-physics-for-invalid-models
don't attempt physics with invalid modelURL
2018-08-14 09:47:37 -07:00
Seth Alves
e5e9339a7b
Merge pull request #13819 from ElderOrb/FB16914
Avatar bookmarks missing from Avatar Favorites
2018-08-14 09:46:37 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00