Commit graph

77656 commits

Author SHA1 Message Date
Simon Walton
c7f270a9ba Combine PR15375 & PR15376 for RC82 branch 2019-04-17 13:47:39 -07:00
John Conklin II
7e3d58dd77
Merge pull request #15397 from SamGondelman/oven282
Case 22222: Fix oven crash
2019-04-17 13:14:59 -07:00
SamGondelman
1b1b651b22 fix oven crash
(cherry picked from commit 2d5cfbf4f5)
2019-04-16 15:20:11 -07:00
Shannon Romano
d1d441e8d2
Merge pull request #15390 from sabrina-shanman/hfm_disable-embedded-materials
Disable baking of embedded material textures in material entities
2019-04-15 14:53:16 -07:00
sabrina-shanman
0940931068 Disable baking of embedded material textures in material entities 2019-04-15 10:42:57 -07:00
John Conklin II
a6d35da562
Merge pull request #15380 from dback2/materialTargetRC82Fix2
Case 22092: Fix material targets when re-opening properties to same entity (RC82)
2019-04-15 10:04:25 -07:00
John Conklin II
5c5dc424a4
Merge pull request #15387 from danteruiz/fix-bubble-82
Case 22157: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields
2019-04-15 09:09:42 -07:00
danteruiz
8e3b76d2e3 fixing bubble 2019-04-12 17:15:40 -07:00
unknown
67f35e7074 fix material targets when re-opening properties to same entity 2019-04-12 14:47:48 -07:00
John Conklin II
c07cce7d63
Merge pull request #15372 from sabrina-shanman/hfm_crash_textures_RC82
(case 22170) Fix TextureBaker failures and heap corruption in MaterialBaker (RC82)
2019-04-12 12:53:06 -07:00
Shannon Romano
a368658da2
Merge pull request #15351 from dback2/materialTargetRC82Fix
Case 22092: Fix avatar/shape material targets, refresh material target when parent changes (RC82)
2019-04-11 17:51:19 -07:00
Shannon Romano
b196c9e037
Merge pull request #15370 from huffman/fix/edit-out-of-range-82
Case 22139: Fix lack of ranges on numerical types in Create
2019-04-11 17:27:25 -07:00
Ryan Huffman
4954d64c9e Fix lack of ranges on numerical types in Create 2019-04-11 14:26:39 -07:00
sabrina-shanman
6ea92a4698 Fix TextureBaker failures and heap corruption in MaterialBaker 2019-04-11 13:50:36 -07:00
unknown
f94c78e15d fix avatar/shape material targets, refresh material target when parent changes 2019-04-11 12:05:28 -07:00
John Conklin II
1b0ab19e07
Merge pull request #15366 from dback2/editContinualTranslateRC82
Case 20896: Fix continual edit handle translation when moving (RC82)
2019-04-11 10:37:59 -07:00
unknown
2d2fd0d2a4 only call onMove on lastMouseEvent change 2019-04-10 09:46:55 -07:00
Shannon Romano
a583f28bd9
Merge pull request #15349 from SamGondelman/jsbaker82
Case 22095: Disable JSBaker for now (RC82)
2019-04-10 09:31:35 -07:00
Shannon Romano
17e3226462
Merge pull request #15359 from SamGondelman/hashtag82
Case 22107: Use # instead of ? for material URL name selection (82)
2019-04-09 16:42:46 -07:00
SamGondelman
8a460276e5 use # instead of ? for material URL name selection
(cherry picked from commit a50cca006e)
2019-04-09 09:33:44 -07:00
John Conklin II
7a4ebd2cbb
Merge pull request #15346 from luiscuenca/computeKdopsFix
(RC82) Fix out of bounds computing KDOPs when the model url is incorrect
2019-04-08 13:00:23 -07:00
luiscuenca
4b7274f02f
Fix comparison warning 2019-04-08 11:28:10 -07:00
SamGondelman
f08b5e3e27 disable jsbaker
(cherry picked from commit 7cbda006a0)
2019-04-08 11:14:50 -07:00
luiscuenca
c4d43e7884
Fix out of bounds when the model url is incorrect 2019-04-08 10:27:51 -07:00
John Conklin II
c902e8392c
Merge pull request #15343 from luiscuenca/fixSimJoints
Fix error extracting SIM joints on Flow
2019-04-05 18:28:05 -07:00
Ryan Huffman
aff80dec26
Merge pull request #15325 from dback2/dynamicMaterialTargetProperties
Case 20738: add dynamic multiselect for material target property
2019-04-05 17:55:26 -07:00
John Conklin II
759d59c709
Merge pull request #15336 from r3tk0n/controller-help-update
Case 22069: Update Controller Help Screen
2019-04-05 17:31:29 -07:00
maspring
575d9673e2
Merge pull request #15338 from danteruiz/another-fading-avatar
Case 22074: Avatars ignored via PAL or bubble (shield) leave semi-permanent copies of themselves
2019-04-05 17:21:28 -07:00
Sam Gondelman
b12a0e5cce
Merge pull request #15342 from SamGondelman/material
Case 20513: Extra check to make sure we remove materials from MyAvatar
2019-04-05 17:18:37 -07:00
Roxanne Skelly
7dda4c7492
Merge pull request #15337 from roxanneskelly/Case22025
Case22025 - Show 'create temporary place' button when no places are present
2019-04-05 17:15:57 -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
Shannon Romano
7e354a953b
Merge pull request #15276 from huffman/fix/new-properties-in-create
Case 20739: Add new web and base properties to Create
2019-04-05 16:55:19 -07:00
Roxanne Skelly
4565bd7e77
Merge pull request #15340 from roxanneskelly/Case21890
Case 21890 - Marketplace search doesn't refresh when enter is pressed
2019-04-05 16:40:29 -07:00
luiscuenca
39b58a44ee Fix error on sim joints for new flow app 2019-04-05 16:38:38 -07:00
r3tk0n
d6ff1caee9 Convert tabs to spaces. 2019-04-05 16:32:20 -07:00
Sam Gondelman
19b109c1f7
Merge pull request #15333 from highfidelity/revert-15266-stencil
Case 22070: Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 16:23:26 -07:00
r3tk0n
9dda272acd Update gamepad with new graphic. 2019-04-05 16:22:31 -07:00
SamGondelman
924bf53698 extra check to make sure we remove material from MyAvatar 2019-04-05 16:22:16 -07:00
r3tk0n
6d03182ed9 Fix scaling issue. 2019-04-05 16:21:42 -07:00
Roxanne Skelly
629d5e50ff CR Fix 2019-04-05 16:16:34 -07:00
Shannon Romano
1b72a514d3
Merge pull request #15328 from Atlante45/fix/injectors
Case 21925: Warn mixer about stopped injectors
2019-04-05 16:09:41 -07:00
David Back
e8b4b8b74c
Merge pull request #15290 from dback2/fixDeleteKeyInHMDDoesCtrlDelete
Case 20880: Fix delete key doing ctrl + delete in HMD
2019-04-05 16:06:01 -07:00
Roxanne Skelly
9888f5feda Copy Pasta 2019-04-05 16:02:09 -07:00
Anthony Thibault
b8b7798ad9
Merge pull request #15296 from luiscuenca/kdopsRotOffsetFix
Add joint rotation offset to the avatar multi-sphere shapes
2019-04-05 15:55:34 -07:00
Anthony Thibault
0e2c5ea3c2
Merge pull request #15291 from luiscuenca/multiSpheresMixFix
Fix avatar multi-sphere bad scaling on some avatars
2019-04-05 15:55:13 -07:00
r3tk0n
e3fdbc3b3c Set bounds of image. 2019-04-05 15:44:34 -07:00
Ryan Huffman
a4919320b3
Merge pull request #15277 from dback2/editHandleContinualTranslateFix
Case 20896: Fix continual edit handle translation when moving
2019-04-05 15:40:57 -07:00
unknown
f2aa155e1e tweak style, add scrolling 2019-04-05 15:35:37 -07:00
unknown
4f4ec064e4 add dynamic multiselect for material targets 2019-04-05 15:35:37 -07:00
Roxanne Skelly
057ee2b01c Case 21890 - Marketplace search doesn't refresh when enter is pressed 2019-04-05 15:20:23 -07:00