Sam Gateau
|
4c1bf6af47
|
REmoving comments
|
2017-07-07 11:38:25 +02:00 |
|
Sam Gateau
|
156c20d01e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-07-07 10:58:05 +02:00 |
|
Clément Brisset
|
34e3f56002
|
Merge pull request #10843 from birarda/bug/user-activities-interface-only
disable user activity logger in DS/AC/ac-client
|
2017-07-06 14:01:49 -07:00 |
|
Stephen Birarda
|
bdcdff3dbc
|
force _isSet to be set before isSet() called
|
2017-07-06 12:01:08 -07:00 |
|
Stephen Birarda
|
916f57772b
|
default the UAL off for all targets, enable manually for Interface
|
2017-07-06 10:21:07 -07:00 |
|
David Kelly
|
1ccf0da7d8
|
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
redo cache switch
|
2017-07-06 09:53:01 -07:00 |
|
Brad Davis
|
d91516c630
|
Merge pull request #10894 from jherico/acclient_fix
Fix ACClient on Linux
|
2017-07-05 18:26:15 -07:00 |
|
David Kelly
|
4a22fbca1b
|
redo cache switch
|
2017-07-05 17:01:31 -07:00 |
|
Brad Davis
|
2409c83d5d
|
Fix ACClient on Linux
|
2017-07-05 16:53:42 -07:00 |
|
Brad Davis
|
7f1bc07d04
|
Trying to fix overlay crashes again
|
2017-07-05 14:30:01 -07:00 |
|
Sam Gateau
|
48b4b5f49c
|
Fixing the bug appearing on Nvidia 284.76
|
2017-07-05 18:39:09 +02:00 |
|
Seth Alves
|
70a7b302fc
|
Merge pull request #10860 from jherico/deadlock_guards
Don't use blocking connections on the main thread
|
2017-07-03 09:05:56 -07:00 |
|
Clément Brisset
|
8744b8e58d
|
Merge pull request #10859 from Atlante45/fix/ac-cleanup
Fix AC cleanup
|
2017-06-30 16:42:15 -07:00 |
|
Stephen Birarda
|
f6fe3f91fd
|
Merge pull request #10829 from birarda/bug/sequence-skips
fix avatar mixer sending empty avatar identities
|
2017-06-30 15:28:29 -07:00 |
|
Brad Davis
|
31d2c9980e
|
Merge pull request #10797 from ctrlaltdavid/21396
Make Leap Motion a plugin
|
2017-06-30 14:37:23 -07:00 |
|
Brad Davis
|
6fc82bb351
|
Switch to preprocessor macro for blocking invokes to capture function information
|
2017-06-30 11:36:24 -07:00 |
|
Brad Davis
|
9c37b28ba0
|
Remove tool window logic
|
2017-06-30 10:58:19 -07:00 |
|
Zach Fox
|
0f9c917965
|
Merge pull request #10853 from samcake/brown
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
|
2017-06-30 10:05:54 -07:00 |
|
Brad Davis
|
8372d73fec
|
Additional thread safety
|
2017-06-30 09:15:06 -07:00 |
|
Brad Davis
|
b52dd7b822
|
Don't use blocking connections on the main thread
|
2017-06-29 20:45:17 -07:00 |
|
anshuman64
|
b22daa9a6f
|
Merge pull request #10838 from druiz17/avatar-recording-roomscale
Fix loading of incorrect joint data for the avatar recording
|
2017-06-29 12:24:37 -07:00 |
|
Atlante45
|
5c731636b1
|
Sandbox restarts crashed processes
|
2017-06-29 12:13:52 -07:00 |
|
Sam Gateau
|
ca7e782566
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-06-29 10:54:27 +02:00 |
|
Sam Gateau
|
b766c256db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-06-29 10:29:05 +02:00 |
|
Thijs Wenker
|
e781f97ddc
|
Merge pull request #10846 from sethalves/fix-server-scripts-more
make ResourceManager be owned by DependencyManager
|
2017-06-28 17:05:30 -07:00 |
|
Seth Alves
|
794495c197
|
make ResourceManager be owned by DependencyManager
|
2017-06-28 14:18:14 -07:00 |
|
Andrew Meadows
|
e9edf01a34
|
Merge pull request #10831 from kencooke/audio-hrtf-optimize
More HRTF optimizations
|
2017-06-28 14:17:00 -07:00 |
|
Ken Cooke
|
0dbb7a71f3
|
CR fix: comments instead of ref code
|
2017-06-28 11:32:24 -07:00 |
|
Seth Alves
|
2f3109e4be
|
move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it
|
2017-06-28 11:00:05 -07:00 |
|
Clément Brisset
|
a2c15c9794
|
Merge pull request #10770 from jherico/fix_deps_1
Cleanup entity dependencies
|
2017-06-28 10:48:58 -07:00 |
|
Ken Cooke
|
0acbdc7755
|
CR fix: use predefined PI
|
2017-06-28 10:18:54 -07:00 |
|
Sam Gateau
|
9b0a0fb23b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-06-28 17:33:26 +02:00 |
|
Andrew Meadows
|
1e23fa7baa
|
Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
Eliminated toe wiggle while pucks are enabled.
|
2017-06-28 08:30:27 -07:00 |
|
Dante Ruiz
|
96ae39989e
|
Merge branch 'master' of github.com:highfidelity/hifi into avatar-recording-roomscale
|
2017-06-28 16:22:41 +01:00 |
|
Dante Ruiz
|
f6ba264de6
|
avatar recording fix
|
2017-06-28 16:22:28 +01:00 |
|
Sam Gateau
|
93963b3257
|
Apply the projection and deferred transform fixes found while working on spectator camera
|
2017-06-28 15:44:17 +02:00 |
|
Sam Gateau
|
1e2b0ca91c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-06-28 10:21:05 +02:00 |
|
Seth Alves
|
e4a9674614
|
Merge pull request #10824 from sethalves/fix-script-sleep-busyloop
use QEventLoop and a timer for a less CPU using sleep + event-processing
|
2017-06-27 21:00:40 -07:00 |
|
Brad Davis
|
28d727153b
|
PR feedback
|
2017-06-27 19:22:07 -07:00 |
|
Brad Davis
|
8130a91b8c
|
Cleanup entity dependencies
|
2017-06-27 19:15:49 -07:00 |
|
Ken Cooke
|
ad970c9f5c
|
fast compute of HRTF azimuth
|
2017-06-27 13:45:18 -07:00 |
|
Howard Stearns
|
20f713a241
|
Merge pull request #10803 from davidkelly/dk/cacheSwitch
new --cache switch for interface
|
2017-06-27 12:23:23 -07:00 |
|
Stephen Birarda
|
089a2bb362
|
do not manage identity data without identity data received
|
2017-06-27 11:58:03 -07:00 |
|
Ken Cooke
|
dcdf07191b
|
Fast acosf() using polynomial approximation
|
2017-06-27 11:29:44 -07:00 |
|
Anthony J. Thibault
|
d4122cff5a
|
warning fix
|
2017-06-27 11:29:08 -07:00 |
|
David Kelly
|
01155ba4e3
|
this handles redirecting ktx_cache, data8, prepared
|
2017-06-27 08:47:54 -07:00 |
|
Sam Gateau
|
1fbaac12ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-06-27 15:54:12 +02:00 |
|
Seth Alves
|
722dc46f60
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-script-sleep-busyloop
|
2017-06-27 06:44:31 -07:00 |
|
Sam Gateau
|
63835d0863
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-06-27 14:24:55 +02:00 |
|
Sam Gateau
|
76dae279cf
|
Removing the default case from the renderer
|
2017-06-27 14:24:34 +02:00 |
|