Commit graph

54207 commits

Author SHA1 Message Date
David Rowe
1b635d8c5e Replace FIXMEs with proper code 2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056 hacking 2017-04-25 18:21:09 -07:00
Seth Alves
8becca3b98 Merge pull request #10283 from ZappoMan/AddUsersToAgent
add support for ignore radius from agent scripts
2017-04-25 17:38:55 -07:00
Seth Alves
dc70e96b0f Merge pull request #10284 from birarda/bug/input-received-signal
fix emission of inputReceived in AudioClient
2017-04-25 17:38:04 -07:00
Clément Brisset
c20a4da96d Merge pull request #10215 from Atlante45/nvtt
Add textures BC compression
2017-04-25 17:34:26 -07:00
Thijs Wenker
5457b8d214 Merge pull request #10260 from PhilipRosedale/halfDuplex
Half Duplex script
2017-04-26 01:47:16 +02:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-25 23:57:48 +01:00
Atlante45
9dbae4b54e CR 2017-04-25 15:56:23 -07:00
Atlante45
56f656f92a Disable compression during runtime 2017-04-25 15:56:23 -07:00
Stephen Birarda
e3ab2615c1 allow NVTT to be built as external on android 2017-04-25 15:56:23 -07:00
Atlante45
1cc86b7203 Fix build error 2017-04-25 15:56:23 -07:00
Atlante45
1820207259 Fix processTextureAlpha 2017-04-25 15:56:23 -07:00
Atlante45
d6ab35ba1a Logging cleanup 2017-04-25 15:56:23 -07:00
Atlante45
b98cd7355e Code cleanup 2017-04-25 15:56:23 -07:00
Atlante45
77d8bf20a7 Fix warnings 2017-04-25 15:56:23 -07:00
Atlante45
fae49668b4 Disable CubeMap and NormalMap compression 2017-04-25 15:56:23 -07:00
Atlante45
145af2b911 Fix ImageReader for images with a wrong extension 2017-04-25 15:56:23 -07:00
Atlante45
62b7855e1f Add pending to stats 2017-04-25 15:56:23 -07:00
Atlante45
fc1b920341 Add ability to disable texture compression 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
63e564c178 Add source hash to KTX metadata 2017-04-25 15:56:23 -07:00
Atlante45
d9a7615cc8 Add compression support for skyboxes 2017-04-25 15:56:23 -07:00
Stephen Birarda
7968045626 update md5 for patched external nvtt 2017-04-25 15:56:23 -07:00
Stephen Birarda
11fa2797b7 force the release DLL path for NVTT on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
202e933d8b don't build, install, or configure nvtt on windows 2017-04-25 15:56:23 -07:00
Stephen Birarda
06b3b3d5f4 ad missing include dir for NVTT on win 2017-04-25 15:56:23 -07:00
Stephen Birarda
d72e5e5b24 add handling for install_name_tool calls on OS X 2017-04-25 15:56:23 -07:00
Stephen Birarda
3a217f75f4 force release for NVTT on Win32 2017-04-25 15:56:23 -07:00
Stephen Birarda
5c12180b58 use pre-built NVTT on windows 2017-04-25 15:56:23 -07:00
Atlante45
ae73cf4038 Add support for Grayscale and NormalMap textures 2017-04-25 15:56:23 -07:00
Stephen Birarda
27c6011e6e change nvtt external to ignore release type 2017-04-25 15:56:23 -07:00
Stephen Birarda
ee62e7dcb8 update nvtt external to build from source 2017-04-25 15:56:22 -07:00
Atlante45
94e1cbbc95 Upload nvtt archive to S3 2017-04-25 15:56:22 -07:00
Atlante45
69a27d516f Fix roughness 2017-04-25 15:56:22 -07:00
Atlante45
5ceb30b69c Make sure mips are copied to memory 2017-04-25 15:56:22 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
Atlante45
2e1355618f Use NVTT to mipmap color textures 2017-04-25 15:56:22 -07:00
Atlante45
0428b22b63 Add nvtt external 2017-04-25 15:56:22 -07:00
Stephen Birarda
da1d93b86c fix emission of inputReceived in AudioClient 2017-04-25 15:41:37 -07:00
Philip Rosedale
16dd6a2ce1 Code review / lint 2017-04-25 15:37:39 -07:00
ZappoMan
8dc41ca8b9 add support for ignore radius from agent scripts 2017-04-25 15:28:26 -07:00
Dante Ruiz
851eece0e4 removed comments 2017-04-25 23:26:16 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01:00
David Rowe
7c2e1aa846 Tidy FIXME 2017-04-26 10:16:35 +12:00
Anthony J. Thibault
ce8b71ff94 viveMotionCapture.js: can now disable puck control, with a second controller squeeze 2017-04-25 15:07:16 -07:00
Andrew Meadows
157dc1475b Merge pull request #10281 from birarda/bug/session-refresh-login
force DS to use new node ID if connect is re-sent
2017-04-25 15:02:57 -07:00