NissimHadar
ced1f7d82b
Typo
2019-04-26 15:30:40 -07:00
NissimHadar
08ca27bf42
Add qt.conf and updated README.md
2019-04-26 15:30:00 -07:00
NissimHadar
a4d5aa8eac
Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2
2019-04-25 14:26:29 -07:00
NissimHadar
450bc96c39
Cleanup.
2019-04-25 08:53:25 -07:00
NissimHadar
db77fda626
testing.
2019-04-25 07:46:23 -07:00
NissimHadar
331f692e34
Cleanup of readme.
2019-04-24 17:39:02 -07:00
NissimHadar
2009ce95b2
Updated readme.
2019-04-24 11:37:46 -07:00
NissimHadar
030f172999
Updated readme for "Fix"
2019-04-24 10:28:11 -07:00
Shannon Romano
4148ebfd18
Merge pull request #15447 from SamGondelman/materialData
...
Case 22329: Don't try to bake materialURL if it points to materialData
2019-04-24 09:26:52 -07:00
Shannon Romano
6da5608ae4
Merge pull request #15430 from huffman/fix/domain-baker-not-finishing
...
Case 22309: Fix domain baker not finishing (merge to master)
2019-04-24 09:19:25 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems
...
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
2019-04-24 09:13:59 -07:00
NissimHadar
4b7a3ac332
Cleaned up readme
2019-04-23 19:00:30 -07:00
NissimHadar
960443323f
Cleaned up readme
2019-04-23 18:47:43 -07:00
NissimHadar
70531bca52
Updated with new Ubuntu zip instructions.
2019-04-23 16:51:27 -07:00
NissimHadar
68f9b473a6
Updated python interface.
2019-04-23 15:06:17 -07:00
SamGondelman
1c888d63f0
don't try to bake materialURL if it points to materialData
2019-04-23 13:44:36 -07:00
NissimHadar
c9d128ae71
testing
2019-04-23 10:39:52 -07:00
NissimHadar
0179ba8e67
testing - removed oven.
2019-04-23 09:12:47 -07:00
NissimHadar
4b26ef7c0f
Updated with upload to AWS instructions.
2019-04-22 16:19:40 -07:00
NissimHadar
0da6e088cb
Updated readme.
2019-04-22 13:15:10 -07:00
SamGondelman
98a7e4e711
fix version not being preserved
2019-04-22 11:34:58 -07:00
NissimHadar
71bf3f2e14
Installation folder can be made.
2019-04-21 20:18:59 -07:00
Ryan Huffman
15e4df2b61
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 15:32:51 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven
...
Case 22213: Fix materialJSON paths in domain baker
2019-04-19 10:39:42 -07:00
Shannon Romano
828677cd10
Merge pull request #15335 from NissimHadar/22067-updateNitpickToUseNewHifiURLs
...
Case 22067: Added 'metaverse' to dev-build URL - v3.2.1
2019-04-19 09:23:49 -07:00
Sam Gondelman
4f9911a655
Merge pull request #15356 from NissimHadar/22096-addVHACDUtilToInstaller
...
Case 22096: Added vhacd-util and Oven to all installers.
2019-04-18 20:25:02 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
...
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
SamGondelman
23918258d9
fix materialJSON paths in domain baker
2019-04-16 10:30:09 -07:00
sabrina-shanman
8f87afd7db
Disable baking of embedded material textures in material entities
2019-04-15 15:00:14 -07:00
Seth Alves
feda884c71
remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts.
2019-04-12 09:21:48 -07:00
David Rowe
ca3f45163f
Merge branch 'master' into M21989
2019-04-11 10:37:34 +12:00
SamGondelman
de3f07cea4
remove js option from parser
2019-04-09 16:39:46 -07:00
NissimHadar
3e292c4b03
Install both oven and vhacd in both client and client+server builds.
2019-04-09 12:30:34 -07:00
NissimHadar
13f0b97d07
Added install_beside_console
2019-04-09 10:40:04 -07:00
NissimHadar
781949da4c
Added package_libraries_for_deployment.
2019-04-08 18:33:33 -07:00
NissimHadar
523253aa13
Added vhacd-util to all installers.
2019-04-08 18:21:04 -07:00
SamGondelman
7cbda006a0
disable jsbaker
2019-04-08 11:03:21 -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
NissimHadar
6f5786e017
Added 'metaverse' to dev-build URL.
2019-04-05 12:25:25 -07:00
Olivier Prat
1322fef568
Taking into account samuel's remarks
2019-04-05 20:15:58 +02:00
Olivier Prat
a45b91c4be
Merge branch 'master' of https://github.com/highfidelity/hifi into amc
2019-04-05 09:01:03 +02: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
David Rowe
2a17ad3da5
AvatarList and AvatarManager JSDoc
2019-04-04 10:11:54 +13:00
Olivier Prat
eadace70f8
Merge branch 'master' of https://github.com/highfidelity/hifi into amc
2019-04-03 18:19:46 +02:00
