Angus Antley
1291ee5ebc
added new animations to the resource
2019-04-23 07:43:31 -07:00
NissimHadar
5144c3b0a8
testing
2019-04-23 07:22:29 -07:00
NissimHadar
bffc0e8a85
Re-ordered commands.
2019-04-22 23:28:43 -07:00
NissimHadar
01a838b5cb
Updated for Jenkins.
2019-04-22 21:36:35 -07:00
NissimHadar
dd85e224a4
Activate Qt patch.
2019-04-22 20:58:15 -07:00
NissimHadar
d7197dba65
Use QT_CMAKE_PREFIX_PATH only on local builds.
2019-04-22 20:56:32 -07:00
David Rowe
7dde764907
Merge branch 'master' into M21956
...
# Conflicts:
# libraries/audio/src/Sound.h
2019-04-23 14:58:23 +12:00
David Rowe
fbc8e1c347
Miscellaneous fixes
2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f
Review updates
2019-04-23 14:35:25 +12:00
Clement
080ef882a8
Update Asset Server redirect and baking conditions
2019-04-22 18:10:34 -07:00
Clement
7f4292440a
Fix oven integration in the asset server
2019-04-22 18:10:34 -07:00
NissimHadar
24110ebf86
Ready for Mac/Linux testing.
2019-04-22 17:58:20 -07:00
SamGondelman
018d249666
Merge remote-tracking branch 'upstream/master' into stencil2
2019-04-22 16:52:12 -07:00
SamGondelman
4fc97effda
combine snapshotOperator lists per sam's suggestions
2019-04-22 16:22:18 -07:00
NissimHadar
4b26ef7c0f
Updated with upload to AWS instructions.
2019-04-22 16:19:40 -07:00
Anthony Thibault
d7babe6fbf
Added data rates for new hand controller section
2019-04-22 16:16:55 -07:00
NissimHadar
f786f5a4a6
Corrected jsdoc comment.
2019-04-22 16:00:44 -07:00
Shannon Romano
5781ed8afb
Merge pull request #15436 from SamGondelman/version
...
Case 22288: Fix "Version" not being preserved during baking
2019-04-22 15:50:38 -07:00
Anthony Thibault
e28775b091
Update avatar dissector to account for has flag bit reorder
2019-04-22 15:37:53 -07:00
unknown
22c2bfc075
fix material target parentIDChanged
2019-04-22 15:03:12 -07:00
NissimHadar
bfcdec62a2
Before testing.
2019-04-22 15:00:22 -07:00
Angus Antley
bac5cf9bbb
fixed the debug state info updating
2019-04-22 14:35:04 -07:00
Angus Antley
6d9e4188eb
added AnimRandomSwitch class and got it integrated with a new avatar-animation.json that includes random idles and random fidgets and random talk
2019-04-22 14:14:17 -07:00
SamGondelman
06fbc8440e
Merge remote-tracking branch 'upstream/master' into stencil2
2019-04-22 13:28:30 -07:00
SamGondelman
7245d1a037
handle texturebakers with same url but different usage
2019-04-22 13:24:34 -07:00
luiscuenca
9c90a2b684
more fixes
2019-04-22 13:17:42 -07:00
NissimHadar
0da6e088cb
Updated readme.
2019-04-22 13:15:10 -07:00
luiscuenca
4a236c3a4b
Fix warnings
2019-04-22 12:40:56 -07:00
Olivier Prat
8dabcb76b8
Taking into account comments
2019-04-22 21:30:57 +02:00
luiscuenca
20cac4cd4d
Rotation fix and refactor
2019-04-22 11:38:27 -07:00
SamGondelman
98a7e4e711
fix version not being preserved
2019-04-22 11:34:58 -07:00
Anthony Thibault
0c0b847666
First version of faux joint optimizations
...
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.
Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
2019-04-22 11:02:13 -07:00
Anthony J. Thibault
5971ddbe24
Improvements to wireshark plugin
...
* properly decodes AvatarData packets embedded within BulkAvatarData packets
* Keeps a running total of all the different types of data within the AvatarData packet.
This is useful for breaking down how much bandwidth is consumed by each sub-section.
(cherry picked from commit f8bca69819afddc506641009133208d16835fbd2)
2019-04-22 10:54:18 -07:00
Sabrina Shanman
2a7ef5c5bb
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master
...
(case 22282) Fix some baked models not preserving texture scale (master)
2019-04-22 09:52:36 -07:00
Sam Gateau
97632534e5
REvert unecessary modified files to upstream master, just leaving the true new feature in this branch
2019-04-22 09:14:32 -07:00
Sam Gateau
6539482cc2
Merge branch 'master' of github.com:highfidelity/hifi into blackProp
2019-04-22 08:46:34 -07:00
NissimHadar
71bf3f2e14
Installation folder can be made.
2019-04-21 20:18:59 -07:00
Clement
0f2dbd7b6a
Fix mac warnings
2019-04-19 20:14:15 -07:00
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
