Mat Tyndall
0e567da8d2
changed USE_STABLE_GLOBAL_SERVICES to use 1
2016-10-13 00:01:17 -07:00
David Rowe
2343e02454
Fix a couple of QML errors
2016-10-13 18:16:21 +13:00
David Rowe
a75925d1e3
Add numeric shift
2016-10-13 14:18:21 +13:00
howard-stearns
78f96a80bd
oops
2016-10-12 16:31:12 -07:00
Anthony J. Thibault
f0dba9e766
Prevent crash on exit.
...
If you or another user begins to near-grab an object while you exit the application, you might run into this crash.
The PhysicalEntitySimulation has a list of AvatarHoldActions shared_ptr's.
When it is destroyed, via the Application destructor, it will release these pointers.
This in turn will invoke a AvatarHoldAction destructor, which attempts to reference the AvatarManager via the DependencyManager.
However at this point the AvatarManager has already been destroyed, leading to a null dereference.
The fix is to check the AvatarManager pointer first.
2016-10-12 16:29:05 -07:00
David Rowe
2ef974f729
Fix alphabetic shift
2016-10-13 12:16:02 +13:00
David Rowe
4dfe290d4a
Add comma and period keys to last row of keyboard
2016-10-13 12:02:36 +13:00
David Rowe
5d390b4722
Revise positions of keys in keyboard
2016-10-13 11:45:14 +13:00
Atlante45
4bea6f2931
Update window size automaticatlly
2016-10-12 15:18:39 -07:00
howard-stearns
b377127fc1
make marketplace tablet be clientOnly
2016-10-12 14:46:04 -07:00
howard-stearns
579c95b5dd
pr feedback
2016-10-12 14:42:41 -07:00
howard-stearns
055e2ffcb0
Merge branch 'master' of https://github.com/highfidelity/hifi into crowd-animation
2016-10-12 14:38:07 -07:00
Howard Stearns
08f3a85aab
Merge pull request #8751 from davidkelly/dk/codecInAgentAvatar
...
Have avatar sounds negotiate codecs
2016-10-12 14:32:39 -07:00
David Rowe
a359626316
Merge branch 'master' into 21070
2016-10-13 09:54:59 +13:00
Brad Davis
2d6522a76f
Merge pull request #8786 from hyperlogic/bug-fix/more-openvr-shutdown-crashes
...
Prevent crashes in openvr on shutdown
2016-10-12 13:54:56 -07:00
David Rowe
e269a84d0e
Add placeholder "FIXME"s for making Web entity keyboard HMD-only
2016-10-13 09:35:39 +13:00
Andrew Meadows
867fc3ccbf
prevent avatar from recentering below ground
2016-10-12 13:23:44 -07:00
Chris Collins
58d4eb7452
Merge pull request #8788 from ctrlaltdavid/fix-asset-browser
...
QA READY: Fix Asset Browser add-to-world
2016-10-12 13:02:35 -07:00
Anthony J. Thibault
aa52963e5d
Made the Grip buttons less sensitive to inadvertent squeezes.
2016-10-12 12:59:43 -07:00
David Kelly
c8850a8b8e
PR feedback
...
AgentAvatarTimer now in its own files. The thread still is created
the same way, and started only when you are an avatar, but now I
remember to stop it when you no longer are one. Audio is still at
100Hz, but avatar messages go at 60Hz as before. Unsure it matters,
but easy to do. Looking at that buzz now.
2016-10-12 12:44:24 -07:00
David Rowe
18f19b07d4
Fix checkbox not being disabled per dropdown default
...
And tweak checkbox position.
2016-10-13 08:37:30 +13:00
howard-stearns
0099a4e549
allow hand controller operations when Interface doesn't have focus, but
...
ONLY when in hmd.
2016-10-12 11:23:06 -07:00
Anthony J. Thibault
ba4c356d7f
Deadlock fix in avatar grab action.
...
Reverse the order we acquire the entityTree & holdActions locks, to avoid deadlocks when the network thread also acquires them.
The network thread does this when hold actions from other avatars are received.
2016-10-12 11:05:19 -07:00
Ryan Huffman
a44653db57
Update ds path queries to be reliable
2016-10-12 10:47:42 -07:00
Seth Alves
16af14d1f6
Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false
...
allow equipped object to follow hand and not controller
2016-10-12 09:52:57 -07:00
Brad Davis
4e0fffb8b7
Merge pull request #8779 from gcalero/shaders_gl_es
...
Adapt shader for GL ES support
2016-10-12 08:32:50 -07:00
Brad Hefta-Gaub
0f1e61e240
Merge pull request #8781 from ZappoMan/tweakGrabPoint
...
adjust grab indicators
2016-10-12 07:08:16 -07:00
David Rowe
86f6cee2ad
Fix Asset Browser add-to-world drop-down
2016-10-12 20:08:33 +13:00
David Rowe
ee31e3b896
Fix Asset Browser add-to-world with spaces unwittingly appended to names
2016-10-12 20:08:15 +13:00
Brad Hefta-Gaub
6630ec3208
Merge pull request #8746 from ctrlaltdavid/21033
...
Send High Fidelity user's visibility when users.js starts up
2016-10-11 21:36:22 -07:00
Brad Hefta-Gaub
8e8eba5e0c
Merge pull request #8770 from jherico/textures_tweak
...
Fix GPU texture counter, better logging for memory pressure
2016-10-11 21:36:03 -07:00
Brad Hefta-Gaub
8ac31a041d
Merge pull request #8654 from ZappoMan/betterAway
...
fix away HMD unmouted logic
2016-10-11 20:35:08 -07:00
Brad Hefta-Gaub
cded9c03f9
Merge pull request #8767 from ZappoMan/viveControllerFixes
...
fix 'any endpoints' for axis style inputs
2016-10-11 20:33:35 -07:00
Brad Davis
28771cbda9
Additional plugin debugging, better plugin resource cleanup
2016-10-11 19:40:02 -07:00
Stephen Birarda
33e426bfd2
Merge pull request #8778 from Atlante45/asset-client
...
Fix crash in AssetClient handleProgressCallback
2016-10-11 18:36:23 -07:00
Anthony J. Thibault
f76dbeeffd
Edit.js now works with new ignoreIK default
2016-10-11 17:12:02 -07:00
Anthony J. Thibault
973ee544fb
Prevent crashes in openvr on shutdown
...
By ensuring that there is an opengl context is bound before calling VR_Shutdown()
2016-10-11 16:36:29 -07:00
Brad Davis
8f42e564b4
Disable 'min free GPU memory', bump max texture memory 65%
2016-10-11 16:34:54 -07:00
Brad Davis
1e7dd7db64
Fix GPU texture counter, better logging for memory pressure
2016-10-11 16:28:16 -07:00
Brad Hefta-Gaub
e1a3bc7d55
hide/show grab point sphere only when in a grabbable entity
2016-10-11 16:22:42 -07:00
howard-stearns
884d22a59b
make agent avatar animations work again, and use them in crowds
2016-10-11 16:06:55 -07:00
Brad Hefta-Gaub
5615f883ce
Merge pull request #8783 from ZappoMan/xboxControllerTweaks
...
fix xbox to match help
2016-10-11 16:03:34 -07:00
Brad Hefta-Gaub
3054311d60
Merge pull request #8782 from samcake/yellow
...
Fixing the key light pass with ambient map
2016-10-11 16:03:24 -07:00
samcake
3ebab3b017
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2016-10-11 15:45:10 -07:00
Brad Hefta-Gaub
95c1237f66
Merge pull request #8776 from samcake/color
...
Add check for bad texture resource slot
2016-10-11 14:50:56 -07:00
samcake
7ea790aa4f
adding a comment to explain what we are doing
2016-10-11 14:43:41 -07:00
Brad Hefta-Gaub
f532affdf3
hardwire xbox to match help
2016-10-11 14:39:45 -07:00
Stephen Birarda
a8568ac821
Merge pull request #8775 from birarda/master
...
remove AssetResourceRequest timeout, output occasional progress to log
2016-10-11 14:31:51 -07:00
Brad Hefta-Gaub
c1763da9b1
Merge pull request #8774 from hyperlogic/bug-fix/oculus-to-desktop-crash
...
Fix crash when switching to desktop mode from oculus HMD mode
2016-10-11 14:29:28 -07:00
David Rowe
49709b42d7
Merge branch 'master' into 21070
2016-10-12 09:45:34 +13:00
