Wayne Chen
55f3c3a11a
allowing context change to change mute state
2019-04-19 18:28:10 -07:00
Simon Walton
5e251b1033
Don't double-free an openssl struct
2019-04-19 17:03:43 -07:00
Sam Gateau
4875e52eba
Merge branch 'blackProp' of github.com:samcake/hifi into blackProp
2019-04-19 16:57:57 -07:00
Sam Gateau
ba02aa7098
making luci2 better
2019-04-19 16:56:55 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread
...
(case 22011) Fix model processing occurring on main thread
2019-04-19 15:40:54 -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
raveenajain
f2312f77c1
remove unused var
2019-04-19 22:47:47 +01:00
raveenajain
65f4fac993
move debug code
2019-04-19 21:40:57 +01:00
Shannon Romano
71ca653498
Merge pull request #15360 from thoys/feat/create/editMultipleProperties
...
Case 21228: [Create App] allow editing properties of multiple entities simultaneously
2019-04-19 13:32:59 -07:00
SamGondelman
080cb36170
bake existing materialMap
2019-04-19 13:01:47 -07:00
Shannon Romano
c09e0eca1d
Merge pull request #15416 from SamGondelman/transparent83
...
Case 22283: Fix transparent textures on baked assets
2019-04-19 12:35:20 -07:00
sabrina-shanman
05a2b11c54
Fix mat4FromVariant
2019-04-19 11:29:28 -07:00
sabrina-shanman
74b4b47a2a
Save some bandwidth by not including unity texture transforms in material jsons
2019-04-19 11:29:28 -07:00
sabrina-shanman
9cb5ed888a
Remove unnecessary hasTexcoordTransform
2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27
Fix baked models not preserving scale in some cases
2019-04-19 11:29:27 -07:00
SamGondelman
b9934bce70
Merge remote-tracking branch 'upstream/master' into materialMap
2019-04-19 11:27:04 -07:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake
...
(case 22271) (RC83) Fix baked models unable to rebake
2019-04-19 10:44:54 -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
sabrina-shanman
7333b02f34
Fix model processing occurring on main thread
2019-04-19 09:48:30 -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
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master
...
(case 22216) Fix Interface not loading some baked models correctly
2019-04-19 08:53:40 -07:00
NissimHadar
69433b1f8a
Merge pull request #15339 from NissimHadar/22076-changeTimeStampURLToEnvironmentVariable
...
Case 22076: Use optional environment variable for timestamp server URL
2019-04-19 07:39:04 -07:00
Wayne Chen
38115b0c09
simplify PTT logic
2019-04-19 07:30:48 -07:00
Wayne Chen
9065a032bd
real fix
2019-04-19 07:30:35 -07:00
Olivier Prat
7d412f9109
Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.
2019-04-19 11:03:43 +02:00
Sam Gateau
b16e790109
Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp
2019-04-18 21:13:55 -07:00
Sam Gondelman
fe3e66b74d
Merge pull request #15418 from SamGondelman/warnings
...
Case 22287: Fix warnings
2019-04-18 20:26:33 -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 Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2
...
Case 22244: Fix oven crash (RC83)
2019-04-18 20:22:36 -07:00
Sam Gateau
af3d981ad1
Bringing the Luci interface into the new Prop framework and moving some tools there too
2019-04-18 17:44:08 -07:00
Wayne Chen
da8f8e0873
real fix
2019-04-18 14:46:08 -07:00
SamGondelman
7fa81ffef3
fix warnings
2019-04-18 12:48:46 -07:00
SamGondelman
27f1255899
fix transparent textures on baked assets
...
(cherry picked from commit b89dbf8346
2019-04-18 11:23:45 -07:00
Olivier Prat
39d03ce87a
Removed magic number
2019-04-18 19:19:38 +02:00
Thijs Wenker
386d392144
The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = >
2019-04-18 19:05:40 +02:00
SamGondelman
0d914a695b
wip
2019-04-18 09:06:02 -07:00
Wayne Chen
5baf2f21d8
adding settingsLoaded bool check
2019-04-18 07:48:59 -07:00
Olivier Prat
9d0706ec8b
Merge branch 'master' of https://github.com/highfidelity/hifi into shadow
2019-04-18 11:06:35 +02:00
Olivier Prat
3cb9c518ea
Exposed max shadow distance and a shadow bias scale parameter in graphics::Light
2019-04-18 11:06:12 +02:00
Sam Gateau
3d78592bb8
Adding more style widgets andbringing luci1 into the panels of luci2
2019-04-18 00:19:19 -07:00
Wayne Chen
3b1751f2c9
adding proper logic for shield icon behavior
2019-04-17 20:19:21 -07:00
Sam Gateau
0359caec8d
Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp
2019-04-17 18:22:52 -07:00
Sam Gateau
9873c10353
Better canvas ICon qml and activation of the jobs
2019-04-17 17:58:48 -07:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling
...
Case 21513: Keyboad doesn't scale to avatar after reloading content
2019-04-17 16:59:42 -07:00
sabrina-shanman
d80b40e5a5
Fix baked FSTs unable to be rebaked by creating an FST in the original
...
output folder
2019-04-17 16:37:01 -07:00
Shannon Romano
bbab0b59b7
Merge pull request #15332 from raveenajain/gltf_brainstem_fix
...
Case 22060 fix model
2019-04-17 16:29:25 -07:00
SamGondelman
e7d12dc4f8
fix snapshots and preview
2019-04-17 15:43:05 -07:00
Thijs Wenker
dc9f8895f8
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties
...
# Conflicts:
# scripts/system/html/js/entityProperties.js
2019-04-18 00:21:11 +02:00
sabrina-shanman
693cdabc2c
Small style fix for materialID bounds check in FBXSerializer_Mesh.cpp
2019-04-17 13:26:19 -07:00
sabrina-shanman
53f74abd49
Fix another Interface issue loading baked models
2019-04-17 13:24:04 -07:00
