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
David Rowe
31b35f0a35
Only raise keyboard if in HMD display mode
2016-10-12 09:43:33 +13:00
Stephen Birarda
504e92607a
change format of debug message
2016-10-11 13:23:52 -07:00
Stephen Birarda
20ea7e6c98
change QLoggingCategory include casing
2016-10-11 13:21:53 -07:00
Stephen Birarda
07d0a038a5
set the initial last progress debug 5s back
2016-10-11 13:21:15 -07:00
samcake
7af3aa53ac
Fixing the key light pass with ambient map
2016-10-11 13:20:32 -07:00
Stephen Birarda
a0c27e2130
remove timer forced timeouts in ARR, occasionally ouput DL progress
2016-10-11 13:17:57 -07:00
Atlante45
e7e9c71625
Fix AssetClient crash
...
Do not access message data until message is complete
2016-10-11 13:05:57 -07:00
Brad Hefta-Gaub
93d9cf7917
adjust grab indicators
2016-10-11 12:42:26 -07:00
Anthony J. Thibault
350977f03e
Speculative fix for crash in AudioClient
2016-10-11 10:49:43 -07:00
Andrew Meadows
abb05bc686
Merge pull request #8753 from ctrlaltdavid/21068
...
Improve indication of user not being logged in
2016-10-11 10:40:37 -07:00
Howard Stearns
48c168fa73
Merge pull request #8769 from sethalves/avoid-ds-ice-metaverse-race
...
fix domain-server update metaverse bug
2016-10-11 10:04:12 -07:00
Stephen Birarda
826c2f1a9f
push the AssetResourceRequest timeout to 15s
2016-10-11 09:55:16 -07:00
Stephen Birarda
ec5850b82b
emit ReceivedMessage progress signals more frequently for new timeout
2016-10-11 09:55:05 -07:00
David Kelly
1fb7b42f0b
One more comment removed
2016-10-11 09:37:42 -07:00
David Kelly
ef844cbd00
Cleanup artifacts
...
Seems playAvatarSound could be called from a thread other than
the Agent's thread. So, artifacts happen when that pointer changes
while a 'tick' is happening. Also cleaned up code a bit, got rid
of some hard-coded stuff I had in just for dev purposes.
2016-10-11 09:33:55 -07:00
Gabriel Calero
834d9c0710
Adapt shader for GL ES support which requires operators of the same datatype
2016-10-11 12:15:49 -03:00
David Kelly
0794d95bdc
Fix merge
...
Take the new crowd-agent.js, my changes were temporary.
2016-10-10 19:58:16 -07:00
David Kelly
fa9c3951c7
Merge branch 'master' into dk/codecInAgentAvatar
2016-10-10 19:51:56 -07:00
samcake
0951ca6bbe
Add check for bad texture resource slot
2016-10-10 18:43:24 -07:00
Anthony J. Thibault
ace8639f5b
Bug fixes in oculus_touch default mapping
...
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
with the handControllerGrab script. Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
2016-10-10 18:42:06 -07:00
David Kelly
b58c36cb12
Rolling my own 100hz timer
...
Starting with the simplest possible thing - just sleep for 10000
microseconds. Can make it adaptive if need be.
2016-10-10 17:57:04 -07:00
Anthony J. Thibault
7ab76984ad
Fix crash when switching to desktop mode from oculus HMD mode
...
Removed internalPresent in oculus uncustomizeContext. It had no ill effects.
2016-10-10 16:54:08 -07:00
David Kelly
c664c7192e
Merge pull request #8759 from howard-stearns/crowd-update
...
update for sound
2016-10-10 16:03:10 -07:00
Brad Hefta-Gaub
774d87a7a7
Merge pull request #8773 from howard-stearns/marketplace-button-state
...
make marketplace button state match whether tablet is being shown
2016-10-10 15:50:07 -07:00
Seth Alves
e9961110e9
if we have new ice-server information, retry right away, even if the previous attempt failed
2016-10-10 15:40:59 -07:00
Seth Alves
06db46e38a
Merge branch 'master' of github.com:highfidelity/hifi into avoid-ds-ice-metaverse-race
2016-10-10 15:37:41 -07:00
Brad Hefta-Gaub
a877f182f7
Merge pull request #8771 from howard-stearns/kick-by-laser
...
fix kick by laser
2016-10-10 15:36:16 -07:00
Brad Hefta-Gaub
d661ae5638
Merge pull request #8766 from ZappoMan/depthReticleFixes
...
fix reticle depth when not moving mouse, but moving head relative to HUD
2016-10-10 15:15:20 -07:00
Brad Hefta-Gaub
798a5cfc9d
Merge pull request #8768 from ZappoMan/nestedSkyboxes
...
fix skybox changing when going between zones
2016-10-10 15:13:33 -07:00
David Rowe
552f276a06
Load avatar browser dialog such that JavaScript EventBridge works
2016-10-11 11:12:57 +13:00
Brad Hefta-Gaub
6c63213c78
Merge pull request #8772 from hyperlogic/bug-fix/web-entity-crash
...
Crash fix for RenderableWebEntityItem::buildWebSurface
2016-10-10 14:38:05 -07:00
howard-stearns
333ec388a8
make marketplace button state match whether tablet being shown
2016-10-10 14:30:47 -07:00
David Rowe
d0900ec75e
Add keyboard to avatar browser dialog
2016-10-11 10:11:36 +13:00
Anthony J. Thibault
e76a7fc577
Crash fix for RenderableWebEntityItem::buildWebSurface
...
Gracefully handle the absence of a gl context. We will continue to retry every render call.
2016-10-10 13:57:54 -07:00
howard-stearns
1051c068e1
kick by hand controller
2016-10-10 13:47:08 -07:00
Seth Alves
9712301172
avoid a race that can cause metaverse to not have correct ice-server information about a domain
2016-10-10 11:54:33 -07:00
