Commit graph

78197 commits

Author SHA1 Message Date
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing
Case 22255: Add size checks for trait packets parsing
2019-04-26 13:29:50 -07:00
Shannon Romano
19bc46bb9d
Merge pull request #15461 from davidkelly/dk/22047
There is no anon restriction - only open, hifi, acl
2019-04-26 12:25:06 -07:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate
Case 22253: Refresh Rate Controller
2019-04-26 12:04:39 -07:00
Shannon Romano
4947f14eb7
Merge pull request #15394 from ctrlaltdavid/M22223
Case 22223: Messages JSDoc update
2019-04-26 10:40:10 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux
Avatar network bandwidth optimization
2019-04-26 10:16:30 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait
Skeleton Trait Implementation
2019-04-26 10:14:47 -07:00
danteruiz
b60e35040e another round of CR 2019-04-26 10:08:06 -07:00
Anthony Thibault
93b03a588f
Merge pull request #15445 from amantley/AnimRandomSwitchSquash
AnimRandomSwitch class for random idle implementation
2019-04-26 10:06:37 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330
Case 22330: Regularize JSDoc deprecation notices
2019-04-26 09:48:45 -07:00
Sabrina Shanman
67e511a6ff
Merge pull request #15439 from SamGondelman/textureUsage
Case 22322: Oven handles TextureBakers with same URL but different usage + fix domain baking
2019-04-26 09:40:57 -07:00
Sam Gateau
244bf4b15e
Merge pull request #15468 from raveenajain/gltf_morphTargets
Case 22012: Morph Targets for glTF Avatars
2019-04-26 08:58:11 -07:00
Sam Gateau
dc7abe1aff
Merge pull request #15450 from amerhifi/feature/macScreenScale
Case 22350: Setting mac default for resolution render scale
2019-04-25 19:33:54 -07:00
Angus Antley
395a4cc9c4 added final animations and json to the resource 2019-04-25 19:14:31 -07:00
raveenajain
0be36783bf hfm blendshape name 2019-04-26 01:37:26 +01:00
Shannon Romano
d0108301a0
Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText
Case 22297: Fix Mute Warning Switch Text
2019-04-25 17:11:45 -07:00
jennaingersoll
24196e2776
Merge pull request #15321 from ctrlaltdavid/M21956
Case 21956: Audio JSDoc
2019-04-25 17:03:58 -07:00
raveenajain
66ad6451f9 morph targets for avatars 2019-04-26 00:40:44 +01:00
Shannon Romano
7692461477
Merge pull request #15298 from NissimHadar/21976-implementScriptAPIFor_gpuTextureMemSizeStable
Cased 21976: Added Script command to test if GPU memory size is stable.
2019-04-25 16:28:42 -07:00
Sam Gateau
5d87c4caad REintroduce the gl context make current and done for Macos... 2019-04-25 16:24:00 -07:00
Clement
d36fd6eaa3 Ensure we don't read past the end of packet buffers 2019-04-25 16:22:01 -07:00
danteruiz
9e1671a1bf making requested changes 2019-04-25 16:02:12 -07:00
SamGondelman
cde84982d0 fix baking 2019-04-25 15:56:56 -07:00
NissimHadar
5aff0bf3e9 Make sure vcpkg'ed version of windeployqt.exe is used. 2019-04-25 15:07:34 -07:00
SamGondelman
6ce6877dfa Merge remote-tracking branch 'upstream/master' into textureUsage 2019-04-25 15:05:27 -07:00
luiscuenca
080f891c9f
Fix scale and refactor debug function 2019-04-25 14:54:40 -07:00
Angus Antley
27ed468946 made changes requested 2019-04-25 14:42:41 -07:00
NissimHadar
230493035d To update the vcpkg Qt. 2019-04-25 14:28:11 -07:00
NissimHadar
a4d5aa8eac Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-04-25 14:26:29 -07:00
NissimHadar
2685550cc1 Merge branch 'master' of github.com:highfidelity/hifi into 21976-implementScriptAPIFor_gpuTextureMemSizeStable 2019-04-25 14:18:43 -07:00
Shannon Romano
766854081a
Merge pull request #15457 from davidkelly/dk/22291
Tiny logical error in wallet creation
2019-04-25 14:10:00 -07:00
Sam Gondelman
26a0eb3993
Merge pull request #15456 from SamGondelman/openurl
Case 22334: openUrl fix
2019-04-25 14:06:46 -07:00
Angus Antley
76164ecee8 corrected the case where you have a random switch state trigger and a random transition trigger in the same random state machine 2019-04-25 13:57:58 -07:00
Clement
e1e7556226 Fix cmake warnings 2019-04-25 13:53:44 -07:00
David Kelly
5554b0bf2c There is no anon restriction - only open, hifi, acl 2019-04-25 13:53:00 -07:00
NissimHadar
261277e4c1 Wrong method call fixed. 2019-04-25 13:49:56 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
Shannon Romano
164984b15d
Merge pull request #15459 from luiscuenca/sentHandsCrashFix
Fix crash sending other avatars hands to flow
2019-04-25 12:32:06 -07:00
SamGondelman
a66c515c2a fix url issue and always generateIrradiance 2019-04-25 11:36:29 -07:00
Thijs Wenker
cdcdae2fda
Merge pull request #15393 from ctrlaltdavid/M22188
Update Record app per Marketplace certification requirements
2019-04-25 20:00:13 +02:00
Shannon Romano
392b372815
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
2019-04-25 10:31:25 -07:00
luiscuenca
6b33f4e027
Don't call function if flow is not active and made it thread safe 2019-04-25 10:31:05 -07:00
NissimHadar
9b22614135 Removed test code. 2019-04-25 10:16:15 -07:00
Angus Antley
baca58360e updated json and talk_righthand anim 2019-04-25 09:50:12 -07:00
David Kelly
c63ee8d4f6 Tiny logical error in wallet creation 2019-04-25 09:21:06 -07:00
NissimHadar
90d7948e0d TEST 2019-04-25 09:01:10 -07:00
NissimHadar
450bc96c39 Cleanup. 2019-04-25 08:53:25 -07:00
NissimHadar
bf1d73b413 Undid testing. 2019-04-25 08:29:53 -07:00
NissimHadar
db77fda626 testing. 2019-04-25 07:46:23 -07:00
David Rowe
e7eaa7815c Misc. JSDoc fixes 2019-04-25 22:01:03 +12:00