SamGondelman
0f3d755cb0
fix baking
2019-04-25 16:00:05 -07:00
SamGondelman
7574912629
fix version not being preserved
...
(cherry picked from commit 98a7e4e711
2019-04-22 11:36:18 -07:00
Ryan Huffman
67ea9055e0
Fix domain baker not finishing (threading, material key)
...
This addresses 2 cases where the domain baker would not finish
1. For material baking, we were storing a value in
_entitiesNeedingRewrite with a different key than what
we use when we later remove it from _entitiesNeedingRewrite
2. The domain baker runs on a worker thread. When starting a
baker for an item in the domain, we do an invokeMethod,
which will happen synchronously if the baker ends up on the
same thread as the thread that the domain baker is on.
This can cause issues if the baker finishes immediately.
The case I saw was a local model url that immediately failed,
and finished before return from the invokeMethod in the domain baker .
2019-04-19 09:50:07 -07:00
sabrina-shanman
0940931068
Disable baking of embedded material textures in material entities
2019-04-15 10:42:57 -07:00
SamGondelman
f08b5e3e27
disable jsbaker
...
(cherry picked from commit 7cbda006a0
2019-04-08 11:14:50 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker
...
Case 21764: Oven bakes model materials directly to separate material description
2019-04-05 17:08:22 -07:00
David Rowe
28dfac64ba
Merge branch 'master' into M21460
...
# Conflicts:
# libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
Shannon Romano
82a8a79172
Merge pull request #15229 from ingerjm0/api-docs
...
JSDoc template and branding changes
2019-04-04 16:51:33 -07:00
ingerjm0
3dbb2b1812
Fix build error for template changes
2019-04-04 15:08:39 -07:00
NissimHadar
8eb428bc77
Merge pull request #15313 from NissimHadar/22021-specificThresholdsPerGPUVendor-v3.2.0
...
Case 22021: specific thresholds per GPU vendor v3.2.0
2019-04-04 12:42:26 -07:00
NissimHadar
4f97899045
Moved position of GPU vendor combo.
2019-04-04 11:31:06 -07:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr
...
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
2019-04-04 10:32:11 -07:00
NissimHadar
3ba5f8e574
Use place holder instead of RCC file.
...
(cherry picked from commit 709515dd744e4526fbb2
2019-04-03 15:25:34 -07:00
NissimHadar
813d467f49
Ready.
2019-04-03 07:43:07 -07:00
NissimHadar
863fce6321
Change version number.
2019-04-03 07:42:00 -07:00
NissimHadar
a856d10798
Improved error message.
2019-04-03 07:39:59 -07:00
SamGondelman
14bd5ed687
remove need for destination path
2019-04-02 16:53:49 -07:00
NissimHadar
0ace57b396
Tested on Mac.
2019-04-02 13:04:14 -07:00
David Back
8de75604cf
Merge pull request #15270 from dback2/avatarExporterWarningFixes
...
Case 20964, 21758: Avatar Exporter v0.4.1 - bone rule fixes
2019-04-02 12:20:39 -07:00
NissimHadar
0e0714c398
Can detect GPU and set combo default.
2019-04-02 11:57:55 -07:00
NissimHadar
efd9a8935e
Clean-up.
2019-04-02 08:59:05 -07:00
SamGondelman
75a246b82d
simplifying material baker and support bump/gloss maps
2019-04-01 22:35:28 -07:00
Olivier Prat
4e39a063f7
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2019-04-01 11:08:41 +02:00
Shannon Romano
f926298020
Merge pull request #15297 from NissimHadar/21984-fixNitpickCMake
...
Case 21988: Use place holder instead of RCC file.
2019-03-29 13:16:56 -07:00
NissimHadar
709515dd74
Use place holder instead of RCC file.
2019-03-29 11:48:15 -07:00
Olivier Prat
7455ddb7ba
Created Image class to encapsulate some transforms with QImage
2019-03-29 12:23:44 +01:00
NissimHadar
705e6432a7
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db
CR comments.
2019-03-28 12:23:25 -07:00
David Back
57c3620587
update package
2019-03-28 11:28:14 -07:00
David Back
4ddbdbbb6c
fix bone rule warnings
2019-03-28 11:27:47 -07:00
NissimHadar
de1c40e994
Changed version.
2019-03-28 11:27:35 -07:00
NissimHadar
e95efc29e4
Bug fix after code review.
2019-03-27 19:00:28 -07:00
SamGondelman
310d01feff
wip
2019-03-27 15:44:01 -07:00
Sam Gondelman
ffbf678695
Merge pull request #15217 from jherico/fix/framereader_files
...
Case 21793: Fix loading relative files
2019-03-27 10:52:35 -07:00
SamGondelman
3d2b71bc7b
remove all existing material parsing
2019-03-26 17:16:13 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222
...
Case 21222: Agent, Avatar, and MyAvatar JSDoc
2019-03-26 15:43:32 -07:00
David Rowe
9a1bb27034
AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc
2019-03-26 13:58:43 +13:00
David Rowe
cf4370ed3a
Merge branch 'master' into M21222
2019-03-26 09:44:48 +13:00
ingerjm0
2b858c4ef5
Show deprecated statement in method details
2019-03-22 11:56:29 -07:00
ingerjm0
ba9426e14e
Fixed font size in docs
2019-03-22 11:56:04 -07:00
NissimHadar
a8dba041a2
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
2019-03-22 11:24:18 -07:00
NissimHadar
faf11480b6
Working changes before merge.
2019-03-22 11:22:14 -07:00
David Back
77ea47a9db
fix no name material override, hide auto scale text after sliding
2019-03-22 11:21:39 -07:00
ingerjm0
7c10fde517
Fix attributes not showing up
2019-03-22 10:34:18 -07:00
ingerjm0
33036bc867
Review of api main page
2019-03-22 10:33:47 -07:00
David Back
6956d01099
Merge pull request #15203 from dback2/avatarExporterBlockExportFromConfigMaster
...
Case 21760: Avatar Exporter v0.3.7 - block exporting from Humanoid
2019-03-22 10:23:21 -07:00
Andrew Meadows
8977aba7c7
Merge pull request #15175 from NissimHadar/21691-improveNitpickWebPage
...
Case 21691: Improve nitpick web page.
2019-03-22 10:06:08 -07:00
NissimHadar
05618931b1
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
2019-03-22 09:55:14 -07:00
Shannon Romano
13e8baeff9
Merge pull request #15246 from ctrlaltdavid/M21846
...
Case 21846: Make JSDoc use "@returns {Signal}" instead of "@signal"
2019-03-22 09:51:28 -07:00
David Back
8db6abb58d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster
2019-03-22 09:28:22 -07:00
