Bradley Austin Davis
8db74413fd
Fix comment in GLBackend
2017-03-03 09:00:12 -08:00
Bradley Austin Davis
efad7da508
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-03 08:59:24 -08:00
Philip Rosedale
ac16d86835
Merge pull request #9788 from ctrlaltdavid/21186
...
Distance grab with second hand rotates entity
2017-03-03 08:39:22 -08:00
David Rowe
388a144af1
Tidying after merge
2017-03-03 18:44:50 +13:00
David Rowe
482c23ead5
Merge branch 'master' into 21186
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-03-03 18:38:42 +13:00
Seth Alves
807e15ade9
Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2
...
avoid animation blending for other avatars
2017-03-02 18:37:18 -08:00
Brad Hefta-Gaub
e655e442a0
Merge pull request #9799 from sethalves/steady-hand-lasers
...
Steady hand lasers
2017-03-02 18:27:39 -08:00
Seth Alves
155a310852
Merge pull request #9761 from Menithal/21166
...
WL#21166 Cloneable Equipment
2017-03-02 16:33:13 -08:00
Seth Alves
10cb7aab06
Merge pull request #9684 from Menithal/parent-hotkey
...
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
2017-03-02 16:30:43 -08:00
Seth Alves
88d6fe6a04
fix offset relative to endParent
2017-03-02 16:26:56 -08:00
Seth Alves
5f570c1ba8
fix up bounds handling in Line3DOverlay
2017-03-02 16:16:48 -08:00
Anthony J. Thibault
bc256f3e8f
Fix for multi-threaded access to maps in DebugDraw.
2017-03-02 14:42:06 -08:00
Anthony J. Thibault
644e29a43d
disable WANT_STATE_DEBUG in handControllerGrab.js
2017-03-02 14:15:05 -08:00
Seth Alves
9b3c16d489
get handControllerGrab overlay lines working again
2017-03-02 12:48:37 -08:00
Seth Alves
2047e0194d
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 12:44:10 -08:00
David Kelly
29f263a296
oh man, this was hard to find
2017-03-02 12:43:41 -07:00
Menithal
91fa871d55
Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey
2017-03-02 21:40:45 +02:00
Menithal
9c31f66b75
Addressed CR of 9684
2017-03-02 21:39:56 +02:00
Ryan Huffman
1564c76ab4
Merge pull request #9792 from huffman/feat/hand-controller-drop
...
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-02 10:51:35 -08:00
Chris Collins
85f25fdfd1
Merge pull request #9800 from highfidelity/stable
...
Sync Stable with Master
2017-03-02 10:45:51 -08:00
Seth Alves
8893c4770e
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 10:02:33 -08:00
Seth Alves
93055a67a8
use new-style hand-lasers for both hands
2017-03-02 10:01:08 -08:00
Howard Stearns
50cf7b00fd
Merge pull request #9797 from davidkelly/dk/3348
...
fix unmute when ignoring in PAL (you can't)
2017-03-02 09:32:38 -08:00
Andrew Meadows
6612d71f85
Merge pull request #9793 from thoys/fix_readme_links
...
Prefer HTTPS links in readme/build docs
2017-03-02 08:25:33 -08:00
Andrew Meadows
a55ab94cd9
other avatars use jointData no Rig animation
2017-03-02 07:52:02 -08:00
David Kelly
79e440be81
fix unmute when ignoring in PAL (you can't)
2017-03-02 08:36:58 -07:00
Stephen Birarda
b586926d09
Merge pull request #9755 from birarda/master
...
increase max renderable web entity FPS to 30 for Youtube.com
2017-03-01 18:09:16 -08:00
Anthony J. Thibault
4f03c06a94
Added General Preference to control stylus vs finger usage
...
By default the finger is preferred over the stylus.
2017-03-01 18:07:53 -08:00
Thijs Wenker
f42f8cf602
bullet moved
2017-03-02 02:39:34 +01:00
Seth Alves
7f6b803652
3d-line-overlays can now have an endParentID and endParentJointIndex
2017-03-01 17:27:32 -08:00
Andrew Meadows
96bb01e5f9
Merge pull request #9790 from AndrewMeadows/fix-avatar-transform
...
fix bug drawing avatar above ground
2017-03-01 17:20:21 -08:00
David Kelly
81451191c1
no need to get the ScriptableAvatar from DependencyManager every time
2017-03-01 18:06:03 -07:00
Seth Alves
7c4869eb73
fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother
2017-03-01 16:10:07 -08:00
Howard Stearns
48ad7fcaae
Merge pull request #9698 from davidkelly/dk/palVolumeSorting
...
PAL average volume sorting
2017-03-01 15:34:05 -08:00
Bradley Austin Davis
fa5b315e09
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-01 15:16:18 -08:00
Menithal
231ebef117
Removed stray debugPrint
2017-03-02 01:01:57 +02:00
Menithal
fd1fded276
Fixed Clone instancing issues
2017-03-02 00:59:45 +02:00
howard-stearns
5be952c4e8
persist sort info for tablet re-opening, and start with column 1
2017-03-01 14:51:48 -08:00
Anthony J. Thibault
465a9e2008
Responsiveness improvement to tablet
...
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
2017-03-01 14:31:04 -08:00
Anthony J. Thibault
d142c3d69b
eslint fix
2017-03-01 13:29:24 -08:00
Anthony J. Thibault
f418457100
Index finger touch support for the tablet-ui.
2017-03-01 13:28:17 -08:00
Anthony J. Thibault
01abb4bdb6
Exposed DebugDraw interface to Java Script
2017-03-01 13:14:29 -08:00
Thijs Wenker
c8911d14e6
http->https
2017-03-01 22:04:51 +01:00
David Kelly
dc754cff5f
magical new glyphs
2017-03-01 13:57:03 -07:00
David Kelly
e8b48eb3aa
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/agentAvatarDataUpdates
2017-03-01 13:51:28 -07:00
Thijs Wenker
1d3be1607d
removed broken Faceshift domain from Build manual
2017-03-01 21:35:35 +01:00
Thijs Wenker
64240d3394
use https in readme/build documentation rather than http
2017-03-01 21:31:43 +01:00
Menithal
82236bdcb9
Merge remote-tracking branch 'upstream/master' into 21166
2017-03-01 22:09:29 +02:00
Menithal
f538ac24f3
Various Properties
2017-03-01 22:07:02 +02:00
David Kelly
45293ab130
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-03-01 12:55:54 -07:00
