Menithal
a6040197eb
Fixed HandcontrollerGrab unequip.
...
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
2016-09-29 22:24:07 +03: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 Hefta-Gaub
aff9999f4b
Merge pull request #8673 from jherico/incremental_disable
...
Add support for disabling incremental texture transfers
2016-09-28 09:54:19 -07:00
Brad Davis
7361b9a166
Add support for disabling incremental texture transfers
2016-09-28 09:23:15 -07:00
Brad Hefta-Gaub
ff73fa322e
Merge pull request #8668 from ZappoMan/hacktest
...
automatic (runtime) disabling of sparse textures systems with 4 or less cores
2016-09-28 09:13:33 -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
Brad Hefta-Gaub
9363c4dda6
Merge pull request #8666 from sethalves/fix-ac-delete-entity
...
fix an AC script's ability to delete entities
2016-09-26 17:35:24 -07:00
Seth Alves
90adb5f67e
fix an AC script's ability to delete entities
2016-09-26 17:14:45 -07:00
Clément Brisset
9ab1830c98
Merge pull request #8662 from Atlante45/home-content-update
...
Ask if user want to update home content when available -- RC update PR
2016-09-26 13:27:11 -07:00
Stephen Birarda
43a3a9a7bd
Merge pull request #8656 from Atlante45/home-content-update
...
Ask if user want to update home content when available
2016-09-26 13:26:41 -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 Davis
ad3355d36d
Merge pull request #8661 from jherico/RC-21
...
Merge from stable into RC-21
2016-09-26 10:54:41 -07:00
Brad Davis
3c9c5331f1
Stable merge
2016-09-26 10:53:48 -07:00
Brad Davis
197c935d75
Merge pull request #8660 from jherico/stable-merge
...
Merge from stable into master.
2016-09-26 10:51:02 -07:00
Brad Davis
1a1c8af58a
Merge from stable
2016-09-26 10:50:26 -07:00
Atlante45
f001cf7570
Make constant for home content URL
2016-09-26 10:44:59 -07:00
Atlante45
cb4d526dcf
Ask if user want to update home content when available
2016-09-23 20:18:41 -07:00
Howard Stearns
3f31da68fe
Merge pull request #8638 from howard-stearns/uniform-story-handling
...
Uniform story handling
2016-09-23 16:11:41 -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
Chris Collins
43690be2d8
Merge pull request #8651 from zzmp/fix/audio-stream-logging
...
fix audio stream logging
2016-09-23 15:42:06 -07:00
Zach Pomerantz
912db1c0e1
silence audiostream logging
2016-09-23 15:32:23 -07:00
Chris Collins
5f325f7923
Merge pull request #8629 from sethalves/ice-troubles-1
...
domain-server tells metaverse if it has no ice-server
2016-09-23 15:26:50 -07:00
Chris Collins
5f45e62333
Merge pull request #8649 from ZappoMan/detectTouch
...
only activate a touch device if one is connected
2016-09-23 15:12:52 -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
Chris Collins
fdb4addf53
Merge pull request #8635 from zzmp/fix/local-audio-injection
...
fix missing local audition for audio injectors
2016-09-23 15:01:14 -07:00
Brad Hefta-Gaub
8f96715521
only activate a touch device if one is connected
2016-09-23 14:30:34 -07:00
Zach Pomerantz
aeaae4ccc8
reload qml with scripts
2016-09-23 14:27:47 -07:00
howard-stearns
a5fb0c9bd5
Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling
2016-09-23 13:16:36 -07:00
Seth Alves
8cadd299a2
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1
2016-09-23 13:16:26 -07:00
Chris Collins
89288b3ed5
Merge pull request #8618 from jherico/oculus
...
Update Oculus SDK
2016-09-23 13:16:22 -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 Hefta-Gaub
d7cfa2bc8c
Merge pull request #8594 from jherico/texture_derez
...
Dynamic texture resolution
2016-09-23 12:30:04 -07:00
Brad Davis
2dd93e0586
Disable debug command list
2016-09-23 12:05:14 -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
2886c51a29
Fixing use of widgets in test app
2016-09-23 12:05:08 -07:00
Brad Davis
bca9da48fc
Fix warnings
2016-09-23 12:05:08 -07:00
Brad Davis
2de7f62b95
Fixing loop logic
2016-09-23 12:05:07 -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
09a218b9fd
Fix build after moving network function
2016-09-23 12:05:04 -07:00
Brad Davis
6711b9c417
Restore proper mip handling to skybox
2016-09-23 12:05:04 -07:00
Brad Davis
5dbaa671ca
Add some more debugging in render perf test
2016-09-23 12:05:03 -07:00
