Commit graph

77474 commits

Author SHA1 Message Date
Simon Walton
56a06ef136 Static avatar certification 2019-04-07 22:14:53 -07:00
Simon Walton
73eef246ef WIP - Avatar static certification 2019-04-05 17:56:27 -07:00
Simon Walton
d6dc579331 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-04 14:01:35 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -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
Shannon Romano
65a039e228
Merge pull request #15312 from roxanneskelly/Case19858
Case 19858 - crashpad_handler is duplicated outside of the Interface/…
2019-04-04 11:27:20 -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
Simon Walton
e4f6f2cb14 Fetch avatars' fst files 2019-04-03 17:43:22 -07:00
Sam Gateau
0d8169bd35
Merge pull request #15311 from danteruiz/double-avatars
Case 21415: Avatars stay behind after they disconnect
2019-04-03 16:07:35 -07:00
Sam Gateau
5730e92871
Merge pull request #15317 from jherico/fix/21911_alt
Case 21730:  Restore composite framebuffer to display plugins
2019-04-03 16:02:47 -07:00
maspring
05cab9a3cc
Merge pull request #15122 from raveenajain/gltf_skinning
Case 21502: skinned gltf
2019-04-03 13:45:41 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins"
This reverts commit cb311408c6.
2019-04-03 13:43:39 -07:00
Roxanne Skelly
1e4398c950 Revert "Temporary crashpad debugging"
This reverts commit df0996cdc9.
2019-04-03 11:31:35 -07:00
Shannon Romano
451b2eb391
Merge pull request #15308 from roxanneskelly/Case20410
Case 20410 - Automatic Content Archives doesn't restore correctly with old Tutorial content set
2019-04-03 11:07:16 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes
Case 21859: Particle Entity emitter shapes, including model
2019-04-03 11:03:33 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all
DDV all, including domainUnlimited
2019-04-03 11:03:16 -07:00
Roxanne Skelly
df0996cdc9 Temporary crashpad debugging 2019-04-03 10:17:12 -07:00
Sam Gateau
d0bf102695
Merge pull request #15314 from AndrewMeadows/more-correct-collision-groups
Case 20991: more correct collision group during grabs
2019-04-03 09:38:30 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid
Case 21893: Remove disabling of --url for Android.
2019-04-03 07:50:31 -07:00
NissimHadar
813d467f49 Ready. 2019-04-03 07:43:07 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -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
Olivier Prat
6b876e6a27 Fixed warnings on Mac & Ubuntu 2019-04-03 12:05:29 +02:00
Olivier Prat
a79e7a2587 Fixed warning 2019-04-03 11:18:15 +02:00
Roxanne Skelly
80683a7b7a Crashpad fix 2nd try 2019-04-02 17:35:09 -07:00
Roxanne Skelly
ac97a82bad Address a CR comment. 2019-04-02 17:25:00 -07:00
Roxanne Skelly
959b8bfbed Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 16:48:32 -07:00
Roxanne Skelly
b841125b19 Case 19858 - crashpad_handler is duplicated outside of the Interface/Sandbox applications on MacOS 2019-04-02 16:42:09 -07:00
danteruiz
ff3e5bbc61 make sure to delete avatar when thier is no reason 2019-04-02 16:20:10 -07:00
raveenajain
fcc7e9af30 minor syntax fix 2019-04-03 00:09:36 +01:00
Anthony Thibault
dd2f8ff2d6
Merge pull request #15309 from hyperlogic/bug-fix/case22010
Case 22010: Bump protocol number to fix joint order mismatch
2019-04-02 16:06:11 -07:00
raveenajain
7e5375d40a Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning 2019-04-02 23:38:19 +01:00
Ryan Huffman
6a16a37339
Merge pull request #15286 from huffman/fix/oven-query-param-in-model-url
Case 20928: Fix some URLs with query params not working with model baker
2019-04-02 15:03:59 -07:00
Ryan Huffman
ea2e62c1ca
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities
Case 20826: Add damping to new dynamic entities in Create
2019-04-02 14:28:35 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
2019-04-02 13:26:50 -07:00
Roxanne Skelly
cf9fe00fd6 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 13:21:52 -07:00
Roxanne Skelly
2d71ec1c75 Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
2019-04-02 13:19:06 -07:00
raveenajain
1435245279 root cluster 2019-04-02 21:18:16 +01: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
3060835029 Merge branch '22021-specificThresholdsPerGPUVendor-v3.2.0' of github.com:NissimHadar/hifi into 22021-specificThresholdsPerGPUVendor-v3.2.0 2019-04-02 12:04:36 -07:00
NissimHadar
0e0714c398 Can detect GPU and set combo default. 2019-04-02 11:57:55 -07:00
raveenajain
8439019c4e update use of vectors 2019-04-02 19:56:17 +01:00
Shannon Romano
c5c643f90e
Merge pull request #15304 from kitely/fix-invoke-adddelete-wearable
case 22001: Fixed calls to addingWearable() and deletingWearable()
2019-04-02 09:09:57 -07:00
NissimHadar
efd9a8935e Clean-up. 2019-04-02 08:59:05 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading
Case 21415: Avatars stay behind after they disconnect
2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00