David Kelly
|
e14a1ad1af
|
minor cleanup
|
2017-03-06 15:26:03 -07:00 |
|
David Kelly
|
db036d997c
|
first pass
|
2017-03-06 15:18:35 -07:00 |
|
Brad Hefta-Gaub
|
781e0be0e3
|
Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh
preserve audio data during pal refresh
|
2017-03-06 08:45:46 -08:00 |
|
Philip Rosedale
|
b730342283
|
Merge pull request #9810 from kencooke/glm-simd-bugfix
Fix unsafe SIMD optimizations
|
2017-03-05 20:47:24 -08:00 |
|
Ken Cooke
|
818425707b
|
update unit tests
|
2017-03-04 16:14:31 -08:00 |
|
Ken Cooke
|
a5571bd49d
|
redo unsafe optimization
|
2017-03-04 16:02:39 -08:00 |
|
Ken Cooke
|
44c1f8500d
|
redo unsafe optimization
|
2017-03-04 15:55:53 -08:00 |
|
Ken Cooke
|
50f92cb934
|
redo unsafe optimization
|
2017-03-04 15:29:23 -08:00 |
|
Ken Cooke
|
46c5f96113
|
redo unsafe optimization
|
2017-03-04 15:24:03 -08:00 |
|
Ken Cooke
|
117bba8b6a
|
redo unsafe optimization
|
2017-03-04 15:17:09 -08:00 |
|
Ken Cooke
|
0bababf1f5
|
Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128
|
2017-03-04 14:53:07 -08:00 |
|
Seth Alves
|
c677326025
|
Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet
Touch the tablet with your finger
|
2017-03-04 11:58:47 -08:00 |
|
howard-stearns
|
15d680d4f9
|
preserve audio data during pal refresh
|
2017-03-03 16:56:12 -08:00 |
|
Brad Hefta-Gaub
|
aaec6ce9f7
|
Merge pull request #9722 from davidkelly/dk/agentAvatarDataUpdates
Agent Avatars sending loudness in AvatarData
|
2017-03-03 14:26:26 -08:00 |
|
Anthony J. Thibault
|
e56f02d94f
|
Changed default for preferFingerOverStylus to false.
|
2017-03-03 14:12:04 -08:00 |
|
Seth Alves
|
bccfa79e8b
|
Merge pull request #9749 from ctrlaltdavid/21176
If someone else is grabbing entity you want to grab show their grab beam
|
2017-03-03 13:43:28 -08:00 |
|
Anthony J. Thibault
|
45febe8565
|
Merge branch 'master' into feature/fingers-on-tablet
|
2017-03-03 09:04:43 -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 |
|
Menithal
|
231ebef117
|
Removed stray debugPrint
|
2017-03-02 01:01:57 +02:00 |
|