Atlante45
|
d5429e76da
|
Warnings fixes and cleanup
|
2016-10-12 10:20:19 -07:00 |
|
Atlante45
|
cc574c3e05
|
Fix string mishandling
|
2016-10-12 10:20:19 -07:00 |
|
Atlante45
|
e5d54fc6bc
|
Move helpers to their own file
|
2016-10-12 10:20:19 -07:00 |
|
Atlante45
|
eaca3b672f
|
Switch to JSON for application settings
|
2016-10-12 10:20:19 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Gabriel Calero
|
834d9c0710
|
Adapt shader for GL ES support which requires operators of the same datatype
|
2016-10-11 12:15:49 -03:00 |
|
samcake
|
0951ca6bbe
|
Add check for bad texture resource slot
|
2016-10-10 18:43:24 -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 |
|
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 |
|
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 |
|