Ryan Huffman
c368c84f59
Make BakeAssetTask::abort thread-safe
2018-02-23 11:06:11 -08:00
Dante Ruiz
d0ec84b6c8
remove menu option for booking marking avatar entities
2018-02-23 10:45:59 -08:00
Stephen Birarda
85bd0442a7
Merge pull request #12488 from Atlante45/feat/backups-integration
...
Merge master into content archives PR
2018-02-23 11:19:42 -07:00
Zach Fox
5ee28297f3
Don't use eventLoop, since that will block the UI
2018-02-23 10:19:00 -08:00
Seth Alves
59bd05aa55
make shadow-related shader compile on osx
2018-02-23 09:22:34 -08:00
Dante Ruiz
d3be1a8a23
Merge branch 'master' of github.com:highfidelity/hifi
2018-02-23 09:20:03 -08:00
Thijs Wenker
a27a5a7e1f
export boolean properties properly
2018-02-23 18:16:38 +01:00
Alexander Ivash
f9de255fa7
FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials
2018-02-23 20:07:09 +03:00
humbletim
7c571cd431
cleanup / addition error message detail
2018-02-23 10:31:57 -05:00
humbletim
058e4d1926
CR feedback; whitespace / remove unnecessary diffs
2018-02-23 09:12:33 -05:00
humbletim
f8fe06213d
CR feedback; whitespace / remove unnecessary diffs
2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17
CR feedback; remove unrollVertices; update getFace; guard more debug logging
2018-02-23 08:57:48 -05:00
humbletim
6ea4b660b7
CR feedback; remove ok bool pointer and all metadata; cleanup
2018-02-23 07:47:39 -05:00
vladest
b8102cfbd7
Make sure sort indicator is attached to the right of title
2018-02-23 10:06:16 +01:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Stephen Birarda
4c44bcfdba
Merge pull request #12487 from Atlante45/feat/backups-integration
...
Actually remove Backup from list during delete
2018-02-22 20:22:43 -07:00
Atlante45
eeda07bba6
Actually remove Backup from list during delete
2018-02-22 19:19:39 -08:00
Stephen Birarda
32830cbcd3
Merge pull request #12486 from Atlante45/feat/backups-integration
...
Never delete assets on load
2018-02-22 19:49:19 -07:00
Clément Brisset
0e5e63bf03
Merge pull request #12481 from birarda/feat/content-settings
...
immediately show restore, set restore filename, cleanup old AS baked content on start
2018-02-22 18:41:13 -08:00
Atlante45
cbabca5e3e
Add loadingComplete callback
2018-02-22 18:36:36 -08:00
Atlante45
e5c501a4cd
Never delete assets on load
2018-02-22 18:36:22 -08:00
Anthony J. Thibault
0469eafbe4
Switch between dualQuats and matrix skinning based on model entity scale factor.
2018-02-22 18:35:16 -08:00
humbletim
0dd3672162
CR feedback / cleanup
2018-02-22 21:20:56 -05:00
Brad Davis
e0e7fb04f2
Fix merge issues
2018-02-22 18:08:56 -08:00
Stephen Birarda
a0f7d4dd34
use const auto & where possible as per CR comments
2018-02-22 18:08:08 -08:00
David Back
ba0ba96d81
undo
2018-02-22 17:54:03 -08:00
humbletim
d1c4bde677
revert OBJWriter.cpp
2018-02-22 20:53:27 -05:00
Stephen Birarda
d69669512f
Merge pull request #12483 from Atlante45/feat/backups-integration
...
Remove deleted file from the _assetsOnDisk set
2018-02-22 18:46:25 -07:00
Atlante45
acf04830ee
Remove deleted file from the _assetsOnDisk set
2018-02-22 17:43:04 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
ZappoMan
9f68accb30
add menu for testing unresponsive interface
2018-02-22 17:34:00 -08:00
David Back
083e461eb0
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors
2018-02-22 17:20:49 -08:00
David Back
902672f85e
add dynamic mode for scripted avatar motor
2018-02-22 17:20:36 -08:00
Zach Fox
249f0568a1
New loader
2018-02-22 17:14:23 -08:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
howard-stearns
1aaae94cc1
checkpoint
2018-02-22 17:04:27 -08:00
Stephen Birarda
d9d2b26519
delete baked content for unmapped files on AS startup
2018-02-22 16:55:35 -08:00
Stephen Birarda
3e4375b1e6
set recovery filename during domain content archive recovery
2018-02-22 16:54:56 -08:00
Stephen Birarda
1251328d2b
reload backup information immediately when restore starts
2018-02-22 16:53:49 -08:00
Zach Fox
e3ccfc9935
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps
2018-02-22 16:39:26 -08:00
Zach Fox
f14673bc50
Fixup Checkout for apps
2018-02-22 16:38:38 -08:00
NissimHadar
3150b963c0
Implemented call to abortTask().
2018-02-22 16:29:58 -08:00
Atlante45
80c0f2a21e
Fix crash when passing --checkMinSpec flag
...
That flag caused a DLL to be loaded before Application was
instanced.
This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
the previous registration pointing the startup function in
the main executable to be overridden with the address of the
function in the DLL (Since they both link the same static
library)
This leads to the correct function running in the wrong address
space (the DLLs), hence not initializing some global variables
correctly.
2018-02-22 16:29:38 -08:00
Zach Fox
33f73fef0d
YAY!
2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346
It's working!
2018-02-22 16:09:01 -08:00
Ken Cooke
f25b8e8df0
Refactor distance attenuation for near-field HRTF.
...
Adds near-field attenuation from 0.125m to 1m, calibrated to 0dB at 1m. Overload will trigger dynamic range compression at the peak-limiter.
2018-02-22 16:05:01 -08:00
Ken Cooke
e367167709
New HRTF with near-field audio spatialization
2018-02-22 15:53:28 -08:00
Brad Davis
4e2d3f23a6
Fix tonemapping on forward render pipeline / GLES
2018-02-22 15:38:15 -08:00
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1
...
Commerce: Extended Certificate Support, V1
2018-02-22 15:19:57 -08:00
Ryan Huffman
c6a806072d
Merge pull request #12478 from birarda/feat/content-settings
...
fix regex for archive name, add general creation error message
2018-02-22 15:14:24 -08:00
