Ryan Huffman
5448099a93
Fix baker CLI not correctly exiting on failure
...
We previusly were exiting while still inside of the QApplication ctor,
before the event loop had been started. This fixes that by queueing up
the baking to occur after the ctor has completed.
2018-03-13 14:57:04 -07:00
Ryan Huffman
6ed89fb9cc
Cleanup asset server versioning changes
2018-03-13 14:52:35 -07:00
Ryan Huffman
df8a25cbdc
Add warning to AssetServer.h to update bake version in .cpp
2018-03-13 14:52:35 -07:00
Ryan Huffman
9a7497c9ec
Update AssetServer to check for baking disabled on startup
2018-03-13 14:52:35 -07:00
Ryan Huffman
0003a32701
Fix AssetServer not detecting missing bakeVersion
2018-03-13 14:52:35 -07:00
Ryan Huffman
99c3e6cf78
Remove unused _temporaryFilesCreated from TextureBaker
2018-03-13 14:52:35 -07:00
Ryan Huffman
e38ef699cc
Remove BakingVersion.h
2018-03-13 14:52:35 -07:00
Ryan Huffman
8a89e8f9fb
Remove BakedTypeInfo
2018-03-13 14:52:35 -07:00
Ryan Huffman
6f3155db32
Fix existing baked assets not being recognized
2018-03-13 14:52:35 -07:00
Ryan Huffman
6ac8cdecd1
Re-enable js baking
2018-03-13 14:52:35 -07:00
Ryan Huffman
091dae730b
Add versioning to Asset Server
2018-03-13 14:52:35 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr
...
Fixes for missing avatar on record replays
2018-03-13 14:10:10 -07:00
Sam Gateau
2dde65d74f
Merge pull request #12631 from SamGondelman/aa
...
Apply TAA to text and web entities/overlays
2018-03-13 13:00:42 -07:00
SamGondelman
4adc357534
apply taa to text and web entities/overlays
2018-03-13 11:57:14 -07:00
Seth Alves
3ee41c71e4
Merge pull request #12529 from Atlante45/fix/nvtt-mac
...
Fix NVTT for mac
2018-03-13 11:28:42 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
...
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
John Conklin II
615c98816f
Merge pull request #12620 from ctrlaltdavid/21778
...
Fix rotation and position of avatar meshes attached to eye joints
2018-03-13 08:17:50 -07:00
Ken Cooke
bcf893db18
Merge pull request #12586 from kencooke/audio-peakmeters-fix
...
Fix crash when closing the Audio menu
2018-03-13 07:52:37 -07:00
Sam Gondelman
db2b79f4fb
Merge pull request #12626 from gcalero/android_hifi_audio_codec
...
Android hifi audio codec
2018-03-12 16:21:21 -07:00
Gabriel Calero
3117ec9015
Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec
2018-03-12 19:44:24 -03:00
Bradley Austin Davis
f48db825c3
Merge pull request #12615 from jherico/fix/ktx_loading
...
Fix local KTX files never being removed from pending downloads
2018-03-12 15:04:40 -07:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android
...
Android: Fix corruption on startup
2018-03-12 15:03:07 -07:00
John Conklin II
7f7d20738a
Merge pull request #12553 from vladest/mac_combobox_misplaced
...
Fix CheckBox on Mac
2018-03-12 14:47:39 -07:00
Ken Cooke
c9e253ab14
Merge pull request #12621 from ctrlaltdavid/21791
...
Fix CPU and GPU not throttling when Interface minimized from maximized
2018-03-12 14:43:47 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
Gabriel Calero
7778ddfdcb
Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec
2018-03-12 18:33:05 -03:00
Gabriel Calero
25f207a6db
Add hifi audio codec in Android build
2018-03-12 18:29:57 -03:00
David Rowe
75189e292d
Fix OSX / Linux warning
2018-03-13 10:22:50 +13:00
SamGondelman
19807676fa
whoops
2018-03-12 14:19:34 -07:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
David Rowe
945858876e
Use std::vector<> instead of QVector
2018-03-13 09:53:25 +13:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
John Conklin II
1c403b7532
Merge pull request #12616 from NissimHadar/bug12435
...
Mitigation of Manuscript issue 12435
2018-03-12 12:01:42 -07:00
Sam Gondelman
3c88ae692c
Merge pull request #12608 from jherico/fix/android_hifi_icon
...
Update Hifi icon for android
2018-03-12 11:26:57 -07:00
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Olivier Prat
bafd6340a2
Removed unused fonts in scripts
2018-03-12 14:21:48 -04:00
John Conklin II
5bd49ce9dc
Merge pull request #12617 from samcake/punk
...
Fix shadow: other avatars casting shadow, graphics settings checkboxes & menu layout
2018-03-12 10:49:48 -07:00
John Conklin II
8b05973939
Merge pull request #12613 from NissimHadar/fixShadowUI
...
Correct can cast shadow flag being visible on entities that can't cast shadows
2018-03-12 10:45:33 -07:00
Sam Gateau
a6a43b90ee
Merge pull request #12554 from NissimHadar/addRecursionToAutotester
...
Pull test images from GitHub
2018-03-12 08:59:07 -07:00
David Rowe
5acc605ba0
Fix OSX / Linux warning
2018-03-12 16:03:31 +13:00
David Rowe
3001225cb7
Fix CPU and GPU not throttling when Interface minimized from maximized
2018-03-12 15:49:20 +13:00
Bradley Austin Davis
e33539f575
Remove unused variable
2018-03-10 18:44:24 -08:00
David Rowe
957d39b0b1
Fix rotation and position of meshes attached to eye joints
2018-03-11 14:49:23 +13:00
NissimHadar
cb24fe6166
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
2018-03-09 18:15:03 -08:00
NissimHadar
84cc4c18a4
Added date/time to testResultsFolder.
2018-03-09 18:13:26 -08:00
SimonWalton-HiFi
e95afe78a2
Merge pull request #12614 from SimonWalton-HiFi/loghandler
...
Loghandler
2018-03-09 17:42:23 -08:00
samcake
10016756b7
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-03-09 16:32:37 -08:00
Brad Davis
7d267bb709
Fix local KTX files never being removed from pending downloads
2018-03-09 16:01:45 -08:00
Simon Walton
cc166dbece
LogHandler regexps - use vector of values
2018-03-09 15:44:56 -08:00
samcake
c78df4d967
Setting the correct Job config for ssao check box and fixing typo
2018-03-09 15:41:56 -08:00
