Brad Davis
dde79ef3c5
Fix GPU buffer leak in geometry cache / overlays
2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub
d5c87a0db6
CR feedback
2016-10-17 12:02:23 -07:00
Stephen Birarda
08dc9e0c4d
use HTTP header for access token added for XMLHttpRequest
2016-10-17 11:34:37 -07:00
Stephen Birarda
b4b5c648c2
use a QWebEngineProfile request interceptor for auth in HTTP header
2016-10-17 11:34:37 -07:00
Brad Hefta-Gaub
d46170bec0
auto shutdown of sandbox when interface quits
2016-10-17 07:55:24 -07:00
Howard Stearns
baea0f5cb0
create a directory chooser that works in hmd, and use it
2016-10-16 17:27:51 -07:00
Brad Hefta-Gaub
aec76cd542
Merge pull request #8799 from ctrlaltdavid/21070
...
HMD keyboard polishing
2016-10-16 01:00:48 -07:00
Brad Hefta-Gaub
3874f173b6
Merge pull request #8818 from jherico/amd_crash
...
Fix AMD crash caused by missing glFlush
2016-10-15 18:47:25 -07:00
Brad Davis
612a1b17ff
Magic number removal
2016-10-15 17:59:27 -07:00
Brad Davis
0be1f82bbc
Fix AMD crash caused by missing glFlush
2016-10-15 15:28:28 -07:00
Stephen Birarda
d1cd99e035
remove a useless two dots
2016-10-14 18:24:39 -07:00
David Rowe
eff8502f67
Merge branch 'master' into 21070
2016-10-15 11:20:30 +13:00
Stephen Birarda
9184a500a0
move faked handshake logic to Socket for handshake req flag
2016-10-14 14:46:58 -07:00
Stephen Birarda
ccbfdf7bb9
only emit client connection reset on requested handshake
2016-10-14 14:46:58 -07:00
Stephen Birarda
eb77258c55
fix magic numbers and hide sendFakedHandshake
2016-10-14 14:46:58 -07:00
Stephen Birarda
5e03e55ca2
fix for dual alias in LimitedNodeList std::bind
2016-10-14 14:46:58 -07:00
Stephen Birarda
a2de31909c
remove define of UDT connection debug
2016-10-14 14:46:58 -07:00
Stephen Birarda
b81eaa649f
make faked handshake request usable in dev/PR
2016-10-14 14:46:58 -07:00
Stephen Birarda
ea2da34bd1
bubble up receiver handshake from udt::Connection
2016-10-14 14:46:58 -07:00
Stephen Birarda
27617b8479
add forced kill of AS for test
2016-10-14 14:46:58 -07:00
Stephen Birarda
5704335b66
add quick fails for no active socket to other AssetClient calls
2016-10-14 14:46:58 -07:00
Stephen Birarda
055df48e8d
make the asset server a solo node type
2016-10-14 14:46:58 -07:00
Stephen Birarda
7fd25ae450
fix returns for missing active socket in LNL
2016-10-14 14:46:58 -07:00
Stephen Birarda
3c70a25a40
immediately error in AssetClient if no active socket for AS
2016-10-14 14:46:58 -07:00
Stephen Birarda
ca94fbc219
refuse to send packets if connection should not be created
2016-10-14 14:46:58 -07:00
Stephen Birarda
f41188b0e8
default last receiver response in send queue to queue creation time
2016-10-14 14:46:58 -07:00
Stephen Birarda
5562d7e7a6
add a filter operator to decide if connections are created
2016-10-14 14:46:58 -07:00
Brad Hefta-Gaub
fb47b42ea5
Merge pull request #8807 from sethalves/fix-import-with-tmp-rez
...
fix entity-import with only tmp-rez rights
2016-10-13 22:32:02 -07:00
David Rowe
0e3cb3eabf
Merge branch 'master' into 21070
2016-10-14 13:29:38 +13:00
Brad Davis
46326ed27c
Fix crash in switching to plugin that uses the composite framebuffer in customizeContext
2016-10-13 16:46:02 -07:00
Seth Alves
fe09a1a57c
make sure interface accepts server adjustment to lifetime, even for imported entities
2016-10-13 16:45:37 -07:00
Chris Collins
90b283f83b
Merge pull request #8806 from huffman/fix/atp-script-cache
...
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 16:30:29 -07:00
Ryan Huffman
6cf4802cc2
Change default hifi address from dev-welcome to welcome
2016-10-13 16:06:07 -07:00
Ryan Huffman
7626f49ddc
Replace qDebug with qCDebug in ScriptCache
2016-10-13 15:43:28 -07:00
Seth Alves
01c1cb328f
don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP
2016-10-13 15:05:13 -07:00
Ryan Huffman
decb94b719
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 14:05:53 -07:00
Brad Hefta-Gaub
0e1b377227
Merge pull request #8785 from jherico/oculus_crash
...
Additional plugin debugging, better plugin resource cleanup
2016-10-13 13:54:34 -07:00
Ryan Downe Karpf
397816679d
Merge pull request #8790 from huffman/feat/reliable-path-queries
...
Update ds path queries to be reliable
2016-10-13 09:21:44 -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
David Rowe
a359626316
Merge branch 'master' into 21070
2016-10-13 09:54:59 +13:00
David Rowe
e269a84d0e
Add placeholder "FIXME"s for making Web entity keyboard HMD-only
2016-10-13 09:35:39 +13:00
Ryan Huffman
a44653db57
Update ds path queries to be reliable
2016-10-12 10:47:42 -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
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
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
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
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
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
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
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
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
Brad Hefta-Gaub
735a6ca994
Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes
...
openvr deadlock and crash on exit fixes
2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub
db5edb530a
fix skybox changing when going between zones
2016-10-09 15:22:35 -07:00
Brad Hefta-Gaub
8da9fccb5d
fix 'any endpoints' for axis style inputs
2016-10-08 20:24:52 -07:00
Anthony J. Thibault
ec801cb9d8
Addressed feedback from code review.
2016-10-07 17:46:46 -07:00
Brad Hefta-Gaub
7e3d63c4e2
Merge pull request #8747 from jherico/buffer_page_fix
...
Fix page size usage in gpu buffers
2016-10-07 16:57:25 -07:00
Ryan Huffman
8a4cfd4735
Remove unreachable code in PluginUtils
2016-10-07 13:37:52 -07:00
Anthony J. Thibault
a4c7e832b5
Reset threadID logging to false
2016-10-07 11:42:34 -07:00
Ryan Huffman
408cc1cd04
Update default hifi address to dev-welcome
2016-10-07 10:30:18 -07:00
Ryan Huffman
e6314a2701
Add changes to isHMDAvailable to specify hmd
2016-10-07 10:30:18 -07:00
Ryan Huffman
a062e6ab9a
Revert change to make tutorial only work for Vive
2016-10-07 10:30:18 -07:00
Ryan Huffman
9c6eae36a7
Update tutorial progress keys
2016-10-07 10:30:18 -07:00
Ryan Huffman
f426f1cd4f
Update isHandController to temporarily only return true for Vive
2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc
Update tutorial to work with HMD + Hand Controllers only
2016-10-07 10:30:18 -07:00
Ryan Huffman
e24a01d1fe
Add path parameter to goToSandbox
2016-10-07 10:30:18 -07:00
Ryan Huffman
03c01bb9b0
Add exception handling to callEntityMethod calls
2016-10-07 10:30:18 -07:00
Ryan Huffman
4efeb928e2
Add user activity logging to tutorial
2016-10-07 10:30:18 -07:00
Howard Stearns
a170436c8c
Merge pull request #8754 from howard-stearns/init-script-update-time
...
init the accumulator for script elapsed time
2016-10-07 10:10:16 -07:00
Howard Stearns
3a294e77d4
Merge pull request #8745 from huffman/feat/new-help-window
...
Update the help window
2016-10-07 10:01:47 -07:00
Ryan Downe Karpf
ed2571704f
Merge pull request #8735 from huffman/feat/teleport-improvements
...
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces
2016-10-07 09:56:30 -07:00
howard-stearns
6cae62f584
init the accumulator for script elapsed time
2016-10-07 09:38:30 -07:00
David Kelly
ab6ccac631
Merge pull request #8741 from howard-stearns/kill-agents
...
kill agents in avatar mixer when they stop being avatars
2016-10-07 09:16:49 -07:00
Seth Alves
f1f8f6323a
Merge pull request #8674 from ctrlaltdavid/21055
...
HMD keyboard
2016-10-07 06:21:36 -07:00
Brad Hefta-Gaub
b1cd553074
Merge pull request #8752 from huffman/fix/script-resolve
...
Fix script paths not resolving correctly
2016-10-06 18:55:57 -07:00
David Rowe
a1458a26fd
Merge branch 'master' into 21055
...
Conflicts:
libraries/gl/src/gl/OffscreenQmlSurface.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-07 14:44:23 +13:00
Brad Hefta-Gaub
b0c2bda898
Merge pull request #8743 from jherico/qml_threading
...
Remove QML threaded rendering
2016-10-06 17:46:12 -07:00
Ryan Huffman
bbd7174d06
Fix script paths not resolving correctly
2016-10-06 17:37:47 -07:00
David Rowe
bdff71151d
Updates from code review
2016-10-07 13:35:44 +13:00
Chris Collins
8310a9fe8a
Merge pull request #8730 from huffman/feat/script-req-retry
...
Add retrying of script requests
2016-10-06 16:09:04 -07:00
Anthony J. Thibault
3158439cba
Prevent deadlock when rapidly switching between openvr and desktop mode
2016-10-06 15:44:24 -07:00
Seth Alves
a5de9cc106
Merge pull request #8742 from sethalves/ac-client
...
AC test client
2016-10-06 15:35:54 -07:00
David Rowe
e2e762f9e7
Merge branch 'master' into 21055
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2016-10-07 11:27:35 +13:00
Chris Collins
aecf71a0d0
Merge pull request #8729 from huffman/feat/atp-set-mapping
...
Add setMapping to ATP scripting interface and fix threading bug
2016-10-06 11:46:19 -07:00
Chris Collins
14f8fb7c90
Merge pull request #8664 from huffman/fix/script-resolve-path
...
Fix ScriptEngine not properly resolving paths
2016-10-06 10:13:44 -07:00
Chris Collins
583332d502
Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities
...
Update entity scripting interface to allow modifications to unknown e…
2016-10-06 09:51:35 -07:00
Seth Alves
7b5106afd8
Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client
2016-10-05 19:36:59 -07:00
Ryan Huffman
4171fdd2e1
Remove extraneous log line from AssetRequest
2016-10-05 19:27:24 -07:00
Ryan Huffman
4901f386ca
Remove unused property in ScriptCache
2016-10-05 19:25:41 -07:00
Ryan Huffman
17a1f9b5ae
Make timer child of QObject instead of attaching to destroyed
2016-10-05 19:25:17 -07:00
Ryan Huffman
bba5a7563f
Remove extraneous logging
2016-10-05 19:25:03 -07:00
Ryan Huffman
42b0d8230c
Move extract/encode enitty functions in ScriptEngine
2016-10-05 19:14:42 -07:00
Brad Davis
48092978e9
Fix page size usage in gpu buffers
2016-10-05 17:05:01 -07:00
Clément Brisset
808419d988
Merge pull request #8740 from AndrewMeadows/fix-physics-unit-tests
...
fix CMAKE warning about un-unit-testable CPP file in physics unit tests
2016-10-05 16:22:26 -07:00
Chris Collins
bc6797fc3a
Merge pull request #8733 from zzmp/fix/audio-channel-swap
...
fix intermittent channel swapping
2016-10-05 15:54:25 -07:00
Ryan Huffman
df09254437
Fix EntityItemID not being converted to string in ScriptEngine
2016-10-05 15:45:54 -07:00
Andrew Meadows
e46c15401a
take care for division by zero when normalizing
2016-10-05 15:00:22 -07:00
Brad Davis
6afe5360fe
Fixing header
2016-10-05 14:36:26 -07:00
Brad Davis
caf7d87841
Restore GL context information to the QML context
2016-10-05 14:01:20 -07:00
Brad Davis
afbbd398dc
Remove QML threaded rendering
2016-10-05 13:48:16 -07:00
Clément Brisset
476ccadb38
Merge pull request #8732 from huffman/feat/category-in-logs
...
Add category to log lines
2016-10-05 13:29:41 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
howard-stearns
dc7a9f253c
kill agents in avatar mixer when they stop being avatars
2016-10-05 13:06:11 -07:00
Zach Pomerantz
afce8c4a45
STEREO_FACTOR -> AudioConstants::STEREO
2016-10-05 13:02:28 -07:00
Zach Pomerantz
5af95c6062
store channels on audio stream
2016-10-05 12:04:24 -07:00
Clément Brisset
d18394f249
Merge pull request #8596 from huffman/feat/my-avatar-self-id
...
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888
Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures
...
Fix model overlay visibility and texture properties
2016-10-05 11:54:11 -07:00
Brad Hefta-Gaub
6f86ce8d3b
Merge pull request #8683 from jherico/oglplus_b_gone2
...
Remove all usage of oglplus
2016-10-05 09:59:42 -07:00
Howard Stearns
32db63e177
Merge pull request #8737 from highfidelity/domain-check
...
Domain check
2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c
Merge pull request #8715 from jherico/offscreen_fences2
...
Support external GL textures with proper fencing
2016-10-05 05:13:06 -07:00
Ryan Huffman
16d535c495
Move EntityTree RayArgs back to header
2016-10-04 20:20:48 -07:00
Ryan Huffman
ee50469213
Add collidableOnly arg to findRayIntersection
2016-10-04 20:19:54 -07:00
Ryan Huffman
da6afb605b
Fix default findRayIntersection surfaceNormal to be in world space
2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737
Disable ray picking against invisible objects in far grab and teleport
2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722
Add the ability to ignore invisible entities in findRayIntersection
2016-10-04 20:19:32 -07:00
Zach Pomerantz
05aded5c9d
differentiate smaples/frames from dropped audio
2016-10-04 18:45:03 -07:00
Zach Pomerantz
00fabb77b4
use proper audio frame naming
2016-10-04 18:27:56 -07:00
Zach Pomerantz
972a611d03
retain stereo on dead audio resampling
2016-10-04 17:54:20 -07:00
Ryan Huffman
2bb2aca2be
Remove commented line in LogHandler
2016-10-04 16:54:37 -07:00
Ryan Huffman
a52e2d8bc5
Add category to log lines
2016-10-04 16:49:24 -07:00
Ryan Huffman
82aa1bafad
Update BatchLoader to use ScriptCache
2016-10-04 16:43:13 -07:00
Ryan Huffman
ca4022814e
Add extra logging to asset client
2016-10-04 16:43:13 -07:00
Ryan Huffman
c6485cc50c
Fix scriptcache only serving empty strings
2016-10-04 16:43:12 -07:00
Ryan Huffman
3c374e8ee2
Add retry logic to ScriptCache
2016-10-04 16:43:12 -07:00
Ryan Huffman
1fff480b73
Add timeout to AssetResourceRequest
2016-10-04 16:43:12 -07:00
Ryan Huffman
c683c82817
Fix setting textures in model overlays
2016-10-04 16:24:43 -07:00
Seth Alves
7261fcae4a
possible fix for domain-server crash-on-exit
2016-10-04 14:35:23 -07:00
Chris Collins
1087885380
Merge pull request #8721 from kencooke/audio-fixes2
...
Fix audio support on Windows7
2016-10-04 10:14:37 -07:00
Brad Hefta-Gaub
9554befb68
Merge pull request #8714 from Atlante45/ack2
...
Fix potential race condition on static memory
2016-10-04 10:05:53 -07:00
Ken Cooke
8491254664
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes2
2016-10-03 18:13:43 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Ken Cooke
46526a309d
Increase audio input buffering on Windows 7
2016-10-03 17:46:09 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
Chris Collins
ca1a7135eb
Merge pull request #8706 from kencooke/audio-fixes
...
Improve support for audio when input rate != output rate
2016-10-03 16:46:56 -07:00
Ryan Huffman
0b2def6013
Fix style error
2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814
Fix incorrect return values in getProcessorInfo
2016-10-03 15:19:03 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
David Rowe
3d75188500
Untabify
2016-10-04 11:03:41 +13:00
David Rowe
3242a7884c
Apply fix from merge conflict to moved code
2016-10-04 11:02:14 +13:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
Atlante45
573d5898cc
Make static control packets class members
2016-10-03 13:46:55 -07:00
howard-stearns
4fcddfdf2b
Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check
2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33
Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus
2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615
Merge branch 'master' into 21055
2016-10-04 08:46:30 +13:00
samcake
afcb5b8557
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-10-03 10:17:46 -07:00
samcake
0df69b8e15
Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug
2016-10-03 10:06:58 -07:00
Ken Cooke
9590d2eef9
Fix support for audio when input rate != output rate
2016-10-03 09:08:32 -07:00
Brad Hefta-Gaub
3612ed95c3
Merge pull request #8703 from hyperlogic/bug-fix/qml-surface-get-root-item-crash
...
Fix for crash bug in web entities
2016-10-02 20:31:35 -07:00
Brad Davis
53f358d77a
Fix warnings
2016-10-02 11:44:36 -07:00
Brad Davis
488d191428
Remove all oglplus usage and references
2016-10-02 11:44:34 -07:00
Brad Davis
d83d3fe98e
Make shader compilation from non-GPU code easier
2016-10-02 11:44:32 -07:00
Brad Davis
f28962af12
Remove dead class from oglplus helpers
2016-10-02 11:44:32 -07:00
Brad Hefta-Gaub
c7551a2207
Merge pull request #8700 from ZappoMan/fetchTextureMapCrashFix
...
fix crash when bouncing to eschatology and eschatology-dev
2016-10-01 21:34:20 -07:00
Brad Hefta-Gaub
51e67df39a
Merge pull request #8669 from jherico/oglplus_b_gone
...
Remove oglplus usage in Offscreen QML rendering
2016-10-01 21:20:51 -07:00
Brad Hefta-Gaub
7ef8e53d03
Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix
...
add guards to getShapeKey
2016-10-01 20:23:50 -07:00
Brad Hefta-Gaub
7fe16442fa
make calculateTextureInfo thread safe
2016-10-01 15:47:17 -07:00
Anthony Thibault
a79485f8c2
Fix for crash bug in web entities
...
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
2016-10-01 13:43:49 -07:00
Brad Hefta-Gaub
04f6547940
add guards to getShapeKey
2016-10-01 12:15:03 -07:00
Brad Davis
933388bc61
Remove oglplus usage from offscreen UI
2016-10-01 11:39:46 -07:00
Brad Davis
265996156c
Remove unused header and typedef
2016-10-01 11:39:45 -07:00
Brad Hefta-Gaub
769a29332c
Merge pull request #8695 from jherico/texture_transfer_crash
...
Fix crash in initializing texture transfer thread
2016-10-01 11:31:37 -07:00
Brad Hefta-Gaub
55d5e80220
Merge pull request #8699 from jherico/gl_context_bug
...
Don't use GL functions before making the context current
2016-10-01 11:30:50 -07:00
Brad Hefta-Gaub
2cba3db2b6
fix crash when bouncing to escotology, which may or may not be related
2016-10-01 11:08:52 -07:00
Brad Davis
0f06d0e4cc
Don't use GL functions before making the context current
2016-10-01 10:40:36 -07:00
howard-stearns
c806f6cad2
better shutdown check for timer firings
2016-09-30 16:05:39 -07:00
Brad Davis
42e28fa010
Fix crash in initializing texture transfer thread
2016-09-30 15:48:10 -07:00
Clément Brisset
02991bffab
Merge pull request #8687 from zzmp/feat/injector-loopback
...
loopback local injectors on server echo
2016-09-30 11:21:10 -07:00
Clément Brisset
becee3bba3
Merge pull request #8685 from thoys/ac-fixes
...
Assignment Client fixes
2016-09-30 11:05:58 -07:00
Chris Collins
322a6e7f2d
Merge pull request #8686 from kencooke/unbuffered-audio-output
...
Even lower audio latency
2016-09-30 10:53:29 -07:00
David Kelly
621e3fc000
Expose triggerOption to scripts, plus _physicsEnabled
...
Now any menu item can be triggered. Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such. Whee!
2016-09-30 09:06:17 -07:00
Thijs Wenker
4f7fdfc345
eliminated else, this might look cleaner
2016-09-30 03:31:35 +02:00
David Rowe
a0dd3d8771
Debounce lowering keyboard and immediately raising it again
2016-09-30 13:43:55 +13:00
David Rowe
5e842843c6
Set alphabetic/numeric keyboard per field entered
2016-09-30 11:54:32 +13:00
Zach Pomerantz
768354e49f
loopback local injectors on server echo
2016-09-29 15:25:17 -07:00
Thijs Wenker
5025b4a5ed
NodeList set the sessionUUID before emitting the connectedToDomain signal
2016-09-29 22:15:53 +02:00
Thijs Wenker
7e3073e163
fix spelling bugs
2016-09-29 22:13:27 +02:00
Thijs Wenker
3d14a32d17
fix controller::ScriptingInterface not found warning in AC
2016-09-29 22:11:12 +02:00
Ken Cooke
858297241b
Even lower audio latency
2016-09-29 12:48:21 -07:00
Brad Hefta-Gaub
38eccd32a8
add developer menu support to enable/disable dynamic texture management
2016-09-29 10:18:54 -07:00
Brad Davis
f73cd1d65e
Merge branch 'RC-21' back into master
...
Conflicts:
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:58:13 -07:00
Brad Davis
31fb395c27
Add support for disabling incremental texture transfers
...
Conflicts:
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:56:50 -07:00
Brad Davis
7361b9a166
Add support for disabling incremental texture transfers
2016-09-28 09:23:15 -07:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
David Rowe
2344d15dbc
Raise and lower keyboard for HTML fields in Marketplace window
2016-09-28 16:41:01 +13:00
David Rowe
875566d956
Raise and lower keyboard for HTML fields in Browser window
2016-09-28 16:40:38 +13:00
Zach Pomerantz
aacfa7d6c5
back out AudioVersion::CurrentVersion
2016-09-27 10:41:00 -07:00
Brad Hefta-Gaub
b5de603921
runtime disabling of sparse textures on less than 4 core systems
2016-09-27 10:32:56 -07:00
Zach Pomerantz
efb71c18a1
expose audio injector streams
2016-09-26 18:51:53 -07:00
Zach Pomerantz
96e9399b89
start MinMaxAvg at default, not numeric limit
2016-09-26 18:51:52 -07:00
Zach Pomerantz
055fabf57b
fix audio AppendFlag semantics
2016-09-26 18:51:51 -07:00
Zach Pomerantz
dbe3104f09
fix -Wreorder
2016-09-26 17:23:18 -07:00
Seth Alves
90adb5f67e
fix an AC script's ability to delete entities
2016-09-26 17:14:45 -07:00
Zach Pomerantz
f5e1d4dd2b
notify on audio stream changes
2016-09-26 15:38:21 -07:00
Zach Pomerantz
b9c4018b8e
expose AudioStats to qml/js
2016-09-26 15:35:29 -07:00
Zach Pomerantz
84ba3223bb
Merge pull request #8650 from zzmp/fix/reload-qml-with-js
...
reload qml with scripts
2016-09-26 11:00:13 -07:00
Brad Hefta-Gaub
ee6719f94a
Merge pull request #8652 from zzmp/fix/audio-injector
...
fix injector restart fail on lack of local interface
2016-09-23 16:07:16 -07:00
Zach Pomerantz
912db1c0e1
silence audiostream logging
2016-09-23 15:32:23 -07:00
Chris Collins
be33524990
Merge pull request #8636 from zzmp/clean/audio-config
...
strip unused audio settings, hide the rest
2016-09-23 15:08:48 -07:00
Zach Pomerantz
faba165408
fix injector fail on lack of local if
...
- consolidate codepaths for new/restarted injections
- allow network injection without local injection
2016-09-23 15:03:38 -07:00
Zach Pomerantz
aeaae4ccc8
reload qml with scripts
2016-09-23 14:27:47 -07:00
Zach Pomerantz
d0f4a29031
Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection
2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b
Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config
2016-09-23 13:11:52 -07:00
Brad Davis
5a91116c06
Fix debug build, fix typo in available texture memory calculation
2016-09-23 12:05:13 -07:00
Brad Davis
e6f23d6ffd
Disable sparse textures on non-Windows systems
2016-09-23 12:05:12 -07:00
Brad Davis
ba3abc7b51
Fix warnings
2016-09-23 12:05:12 -07:00
Brad Davis
ab8a67e84d
Code review comments
2016-09-23 12:05:11 -07:00
Brad Davis
74a3d7fcb9
Flush executed commands on the transfer thread
2016-09-23 12:05:10 -07:00
Brad Davis
44a549317e
Reduce number of texture transfers per clientWait, process smaller textures first
2016-09-23 12:05:09 -07:00
Brad Davis
bca9da48fc
Fix warnings
2016-09-23 12:05:08 -07:00
Brad Davis
c52de6c685
Fixing mip deallocation
2016-09-23 12:05:06 -07:00
Brad Davis
cfa5376eff
Straight up bug
2016-09-23 12:05:05 -07:00
Brad Davis
6711b9c417
Restore proper mip handling to skybox
2016-09-23 12:05:04 -07:00
Brad Davis
28bb82c8a3
Force all sparse allocation and deallocation onto one thread / context
2016-09-23 12:05:02 -07:00
Brad Davis
255e9e6435
Add support for executing arbitrary commands on the texture transfer thread
2016-09-23 12:05:01 -07:00
Brad Davis
ee476a6048
GLTextures store the source for easier debugging
2016-09-23 12:05:01 -07:00
Brad Davis
d382305174
Add fence tracking and max values tracking to gpu::Context
2016-09-23 12:05:00 -07:00
Brad Davis
2a058fa419
Add file logging to perf tool
2016-09-23 12:04:59 -07:00
Brad Davis
f33d3a3b36
Migrate logging functionality to shared library
2016-09-23 12:04:58 -07:00
Brad Davis
82db3d5d55
Disable support for framebuffer resizing
2016-09-23 12:04:57 -07:00
Brad Davis
0953027ef3
Identify pre-generated textures
2016-09-23 12:04:56 -07:00
Brad Davis
fa23fa7b2d
Working on cubemap mip bug
2016-09-23 12:04:55 -07:00
Brad Davis
ffbddd2d0f
Disable sparse textures on cubemaps
2016-09-23 12:04:55 -07:00
Brad Davis
88bbb2faa8
Fix cubemap mips by overcommiting
2016-09-23 12:04:54 -07:00
Brad Davis
5734332150
Fix sparse texture deallocation
2016-09-23 12:04:53 -07:00
Brad Davis
64cb45240d
Fix invalid page size for non-sparse textures
2016-09-23 12:04:52 -07:00
Brad Davis
1ff91219a8
Fix strange artifacts in skybox
2016-09-23 12:04:52 -07:00
Brad Davis
74481b3c1f
Re-enable threaded texture transfer
2016-09-23 12:04:51 -07:00
Brad Davis
50233f6ffb
Don't re-report texture memory usage until the returned value changes
2016-09-23 12:04:50 -07:00
Brad Davis
12de36a534
Check the total GPU memory usage from the card as well as our computed memory usage
2016-09-23 12:04:49 -07:00
Brad Davis
26a06b2914
Removing invalid comments
2016-09-23 12:04:48 -07:00
Brad Davis
70ec9783fa
Only use sparse allocation for supported sizes / formats
2016-09-23 12:04:48 -07:00
Brad Davis
f9857c7ac4
Disable threaded texture transfers
2016-09-23 12:04:47 -07:00
Brad Davis
07ccbc6f82
Fixing warnings
2016-09-23 12:04:46 -07:00
Brad Davis
2b5ed86a62
Fixing warnings
2016-09-23 12:04:45 -07:00
Brad Davis
151df32519
Check sparse texture support before enabling
2016-09-23 12:04:44 -07:00
Brad Davis
a55669b83e
Only enable sparse textures by env variable
2016-09-23 12:04:44 -07:00
Brad Davis
93b0364f73
Working on sparse stability
2016-09-23 12:04:43 -07:00
Brad Davis
a7f0ba24ed
Dynamic texture memory management
2016-09-23 12:04:42 -07:00
Zach Pomerantz
09a96796de
bring audio stream initializers to standard
2016-09-23 11:58:15 -07:00
Chris Collins
216c6b8f6f
Merge pull request #8624 from sethalves/ice-troubles
...
ICE server related utilities and changes
2016-09-22 11:26:23 -07:00
Seth Alves
c43c83019d
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
2016-09-22 10:34:25 -07:00
Seth Alves
dc5e63c4f1
re-enable web entity-items on linux
2016-09-22 10:25:26 -07:00
David Rowe
e1164edfde
Display keyboard only for editable fields
2016-09-22 15:28:49 +12:00
Brad Hefta-Gaub
5d3d4bdbd9
add support for redirection on domain at max capacity
2016-09-21 18:12:38 -07:00
Zach Pomerantz
81b6bb3a2d
rm unused DEFAULT_GATE_THRESHOLD
2016-09-21 18:04:07 -07:00
Zach Pomerantz
e2ff738fc3
strip unused audio settings
...
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Zach Pomerantz
9e2ec27b29
always play audio injectors locally
2016-09-21 17:20:51 -07:00
Ken Cooke
b14f43b11e
Merge pull request #8610 from zzmp/test/audio-jitter
...
add audio jitter simulator testing tool
2016-09-21 16:43:36 -07:00
David Rowe
6f2956392e
Merge remote-tracking branch 'seth/qml-keyboard' into 21055
2016-09-22 08:45:58 +12:00
Seth Alves
5802159d16
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
2016-09-21 10:07:25 -07:00
Brad Hefta-Gaub
cc8aa540b4
fix unix build
2016-09-20 15:54:57 -07:00
Brad Hefta-Gaub
52f0b5f6c8
cleanup
2016-09-20 14:06:02 -07:00
Brad Hefta-Gaub
6c68d9abb3
beter center image around center of eye
2016-09-20 14:04:51 -07:00
Seth Alves
2468b56079
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-20 13:28:20 -07:00
Brad Hefta-Gaub
73a7d1b63b
redraw no-preview message if window size changes
2016-09-20 10:15:27 -07:00
Brad Hefta-Gaub
8f5c5ebf0e
improved disabled preview wording
2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
09b3292f94
fix unix build
2016-09-19 16:32:36 -07:00
Brad Hefta-Gaub
8eb5f6682a
cleanup code
2016-09-19 15:09:03 -07:00
Brad Hefta-Gaub
427f6b100f
Merge branch 'master' of https://github.com/highfidelity/hifi into improvedPreview
2016-09-19 11:09:58 -07:00
Seth Alves
fe085d7b90
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
2016-09-19 09:58:27 -07:00
Chris Collins
3d9f231543
Merge pull request #8609 from zzmp/fix/audio-stats
...
fix audio network stats
2016-09-19 09:08:35 -07:00
Brad Hefta-Gaub
f923b2ede4
first cut at improved HMD preview
2016-09-18 20:32:23 -07:00
Clément Brisset
3552a7c757
Merge pull request #8612 from zzmp/fix/elongate-jitter-wait
...
wait 10s before growing jitter in a new session/domain
2016-09-16 17:34:22 -07:00
Seth Alves
2e0cc158de
ice test-client uses stun server to get public address
2016-09-16 17:21:28 -07:00
Zach Pomerantz
b6d093889c
add AudioConstants::SAMPLE_SIZE
2016-09-16 14:20:50 -07:00
Seth Alves
babe8f95bc
tool for testing ice-server
2016-09-16 13:34:05 -07:00
Zach Pomerantz
45b306fc97
fix preference for jitter sim
2016-09-16 12:14:57 -07:00
Zach Pomerantz
0d3a9af6a6
wait 10s before growing jitter
2016-09-16 12:03:54 -07:00
Zach Pomerantz
80bce953f7
justify jitter simulation
2016-09-16 11:40:37 -07:00
Zach Pomerantz
177466e4c7
calculate unplayed ms on all streams/buffers as max
2016-09-15 17:54:41 -07:00
Zach Pomerantz
53f5899a69
add audio jitter simulator
2016-09-15 14:51:39 -07:00
Zach Pomerantz
9792d025fa
clean up audio stats
2016-09-15 13:09:06 -07:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
Andrew Meadows
06b17995b1
Merge pull request #8598 from kencooke/optimized-audio-pipeline
...
Optimized audio pipeline
2016-09-14 12:18:40 -07:00
Seth Alves
e5e9bb0052
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-14 11:28:10 -07:00
Ken Cooke
ad97a15e8b
Handle another case when resampling is not needed
2016-09-14 09:54:15 -07:00
Seth Alves
e6a1c14de6
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-14 09:43:19 -07:00
Ken Cooke
e82d751dac
Fix typo
2016-09-14 08:25:41 -07:00
Ken Cooke
25920732ec
Remove unused buffer
2016-09-14 08:23:53 -07:00
Ken Cooke
96313a421c
Cleanup the confusion of using null-resampler for channel conversion
2016-09-14 08:22:18 -07:00
Ken Cooke
c555e369c8
Handle the case when resampling is not needed
2016-09-14 06:37:09 -07:00
Ken Cooke
27d24eb79b
Fix compiler warning
2016-09-13 20:56:36 -07:00
