Seth Alves
e79642396d
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1
2016-10-18 13:43:20 -07:00
Seth Alves
0c6dedff45
avoid various data-races related to stats collection and delivery
2016-10-18 13:05:53 -07:00
Stephen Birarda
f8e0d7ad88
move QWebEngine classes to ui library
2016-10-18 12:53:32 -07:00
Brad Hefta-Gaub
0b6e041d45
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-18 12:16:35 -07:00
Brad Hefta-Gaub
d59c026ded
Merge pull request #8842 from huffman/fix/empty-urls
...
Fix bug in Script.include when urls is empty
2016-10-18 12:09:18 -07:00
Atlante45
0858b3fc8d
Inform user their Steam informations will not be shared
2016-10-18 12:07:18 -07:00
Stephen Birarda
5682d51667
use the HFWebEngineProfile in Desktop.qml
2016-10-18 11:42:55 -07:00
Ryan Huffman
73a0266edb
Fix case in Script.include where urls is empty
2016-10-18 11:41:15 -07:00
Atlante45
c40a027108
Add virtual keyboard for steam username collision
2016-10-18 11:16:14 -07:00
Seth Alves
0cda01f105
send stats to domain-server with networking thread
2016-10-18 10:29:35 -07:00
Seth Alves
1203aae96b
don't create ScriptEngines for ACs that don't need them
2016-10-18 10:29:09 -07:00
Stephen Birarda
c4cec8eb1e
use desktop profile again, move classes to networking subdir
2016-10-18 10:22:31 -07:00
howard-stearns
ecd84bf23d
desktop vertical
2016-10-18 10:05:39 -07:00
Stephen Birarda
81cb33574d
check for HTTPS scheme in bearer add in XMLHttpRequest
2016-10-18 10:04:43 -07:00
Stephen Birarda
a45677c2a2
mark intercept override, only add header for HTTPS
2016-10-18 10:03:46 -07:00
Brad Hefta-Gaub
834a15a03b
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-18 10:01:57 -07:00
Brad Hefta-Gaub
c082c74cc0
use head pose for controller in case there are no hand controllers available
2016-10-18 10:01:00 -07:00
Brad Hefta-Gaub
c50cd865e5
add RTClick and LTClick support to gamepad
2016-10-18 09:50:35 -07:00
howard-stearns
0d2bd23874
cleanup
2016-10-18 09:38:55 -07:00
howard-stearns
0dd5c65036
Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar
2016-10-18 09:36:43 -07:00
howard-stearns
3ce3e57c38
Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar
2016-10-18 09:36:09 -07:00
Brad Hefta-Gaub
0d48eb55b9
Merge pull request #8835 from zzmp/fix/entity-del-deadlock
...
fix deadlock when removing tablet
2016-10-18 01:21:55 -07:00
Brad Hefta-Gaub
13e5c31d0d
Merge pull request #8829 from jherico/gpu_leak
...
Fix GPU buffer leak in geometry cache / overlays
2016-10-18 01:12:44 -07:00
Brad Hefta-Gaub
c8fa2e3c9a
Merge pull request #8831 from hyperlogic/bug-fix/fbxreader-crash-fix
...
Speculative fix for crash in FBXReader.cpp
2016-10-18 01:08:29 -07:00
Brad Hefta-Gaub
f9054bef9b
Merge pull request #8816 from davidkelly/dk/1811
...
CellScience play button doesn't play anything
2016-10-17 21:20:57 -07:00
Brad Hefta-Gaub
478c0856f3
Merge pull request #8837 from sethalves/fix-avatar-entities-delete
...
fix crash when deleting avatar-entities
2016-10-17 21:20:27 -07:00
Chris Collins
a9dd31f59d
Merge pull request #8833 from jherico/gpu_stats
...
Add GPU buffer and texture current counts to the main stats display
2016-10-17 21:03:23 -07:00
Chris Collins
b43301cd8c
Merge pull request #8824 from huffman/fix/batch-load-crash
...
Fix race condition in BatchLoader
2016-10-17 20:55:38 -07:00
Chris Collins
73bee7efc1
Merge pull request #8834 from Atlante45/place-name
...
Don't override place name path with index path
2016-10-17 20:53:05 -07:00
Seth Alves
5d085798cb
Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entities-delete
2016-10-17 17:42:17 -07:00
Seth Alves
ff32ddae01
Merge pull request #8832 from howard-stearns/fix-directory-picker-when-choosing-default
...
directory picker works when choosing the initial value
2016-10-17 17:40:25 -07:00
Brad Davis
99ed7ac08c
Fix shutdown crash (hopefully)
2016-10-17 17:38:10 -07:00
Ryan Downe Karpf
6ae6fc4057
Merge pull request #8836 from howard-stearns/explicit-disconnnect-dialog
...
switchable placeholder for domain-connection failure, currently a modal
2016-10-17 16:30:23 -07:00
Seth Alves
9b7086b1fb
added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue
2016-10-17 16:11:37 -07:00
Zach Pomerantz
301f3ced98
fix typoed threaded call
2016-10-17 15:30:49 -07:00
Stephen Birarda
3cbdf13931
add intercepted profile to uit WebView
2016-10-17 15:04:33 -07:00
howard-stearns
7a3c14683e
switchable placeholder for domain-connection failure, currently a modal
2016-10-17 14:50:46 -07:00
Atlante45
3955c6c4c6
Don't override place name path with index path
2016-10-17 14:41:05 -07:00
Stephen Birarda
4ec703b7dc
remove unused import from uit WebView
2016-10-17 14:29:12 -07:00
Stephen Birarda
3ce47631b7
move the intercepted web engine profile to BaseWebView
2016-10-17 14:25:59 -07:00
Zach Pomerantz
95eb52ad17
bail early when removing entity focus
2016-10-17 14:02:22 -07:00
Brad Davis
1e9c369660
Add GPU buffer and texture current counts to the main stats display
2016-10-17 14:02:14 -07:00
howard-stearns
e7392acb10
directory picker works when choosing the initial value
2016-10-17 13:50:23 -07:00
Brad Hefta-Gaub
bf4489f3cf
Merge pull request #8830 from huffman/feat/update-gamepad-help
...
Update gamepad help image
2016-10-17 13:30:44 -07:00
Anthony J. Thibault
1c6fbc08bf
Speculative fix for crash in FBXReader.cpp
...
I could not reproduce the issue, however looking at the stack trace shows that
the crash is due to indexing past the end of the FBXNode::properties QVariantList.
Guard against this from happening by checking the property length first.
2016-10-17 13:22:17 -07:00
Chris Collins
f1b2dd8b1a
Merge pull request #8825 from howard-stearns/recover-from-cancelled-snapshot-directory
...
check for empty snapshot dir, and default to temp
2016-10-17 13:21:58 -07:00
Chris Collins
1c30d98cf9
Merge pull request #8823 from ZappoMan/shutdownSandbox
...
Auto-shutdown of sandbox if it was launched by interface
2016-10-17 13:20:15 -07:00
Brad Hefta-Gaub
dcab5a5dbc
fix unix warning
2016-10-17 13:12:24 -07:00
Chris Collins
5b9606f0fc
Merge pull request #8826 from zzmp/fix/failed-oculus-gl
...
avoid uninitialized oculus gl calls
2016-10-17 13:11:16 -07:00
Ryan Huffman
9ef6aee3d1
Fix race condition in BatchLoader
2016-10-17 13:10:19 -07:00
