Commit graph

65114 commits

Author SHA1 Message Date
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
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
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
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
Stephen Birarda
fc9af39745
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes
Add #include of Forward.h to AudioMixer.h
2018-02-22 16:09:24 -07:00
Stephen Birarda
7fcac581ae fix regex for archive name, add general error message 2018-02-22 15:08:43 -08:00
Atlante45
7bad82818b Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-02-22 14:45:41 -08:00
Zach Fox
de0eee52d6 cool 2018-02-22 14:45:32 -08:00
Ryan Huffman
13b15ced89
Merge pull request #12470 from birarda/bug/content-settings-fixes
disable click on restore during a restore or for corrupted
2018-02-22 14:41:41 -08:00
Ryan Huffman
12e881a5e3
Merge pull request #12471 from birarda/feat/validate-manual-backup-names
refuse to post manual content archive with invalid name
2018-02-22 14:29:43 -08:00
ZappoMan
e9cad947d7 add the deadlock watchdog stats to the stats metaverse checkin data 2018-02-22 14:01:56 -08:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Alexander Ivash
c15cf33ca1 12518 - Help icon in toolbar does not highlight when help window is open 2018-02-23 00:36:00 +03:00
John Conklin II
43afd257b6
Merge pull request #12361 from highfidelity/RC64
Beta Release 64 - includes up to Developer Release 7818
2018-02-22 13:22:47 -08:00
Liv Erickson
269d8312e2 wrap selection print in wantDebug to avoid spamming logs in HMD 2018-02-22 13:03:16 -08:00
Stephen Birarda
7c5ed86e3e refuse to post manual content archive with invalid name 2018-02-22 11:41:48 -08:00
Stephen Birarda
3c39c92879
Merge pull request #12468 from huffman/fix/reject-invalid-manual-backup-names
Fix/reject invalid manual backup names
2018-02-22 12:17:42 -07:00
Simon Walton
a0a12258bf Merge branch 'master' into moc-fixes 2018-02-22 11:06:53 -08:00
Stephen Birarda
99c419c315 disable click on restore during restore or for corrupted 2018-02-22 11:03:31 -08:00
John Conklin II
e1ed0977e8
Merge pull request #12469 from jherico/RC64_stable
Merge from stable back into RC64
2018-02-22 10:58:38 -08:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00