Commit graph

77638 commits

Author SHA1 Message Date
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
John Conklin II
78256fb5bb
Merge pull request #15347 from luiscuenca/computeKdopsFix83
Fix out of bounds computing KDOPs when the model url is incorrect
2019-04-08 13:17:12 -07:00
luiscuenca
0d92ec1f5b
Fix comparison warning 2019-04-08 11:24:59 -07:00
Thijs Wenker
98e0164964
Merge pull request #15281 from kitely/copy-grandchild-entities
case 21980: Allow copying grandchild entities
2019-04-08 19:59:46 +02:00
luiscuenca
d9eaa2076d
Fix out of bounds when the model url is incorrect 2019-04-08 10:36:58 -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
danteruiz
475cf4d6f7 fix another fading avatar 2019-04-05 15:10:30 -07:00
Ryan Huffman
9c4b3f017f
Remove min/max on web entity maxFPS
Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.
2019-04-05 15:08:48 -07:00
r3tk0n
e03e78cc8c Add href element to image. 2019-04-05 15:04:35 -07:00
Roxanne Skelly
a63171fb94 Case22025 - Show 'create temporary place' button when no places are present
The metaverse urls were hard-coded to be production.  Fix is to pull them
from the domain server, which will pull them from the environment variable.
2019-04-05 14:54:02 -07:00
r3tk0n
84a67641a8 Update images. 2019-04-05 14:39:02 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Shannon Romano
fd245b61ab
Merge pull request #15263 from ctrlaltdavid/M21460
AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc
2019-04-05 11:39:58 -07:00
David Rowe
ca2c8caddb Reinstate TextureCache.TextureType JSDoc 2019-04-05 17:53:19 +13:00
David Rowe
28dfac64ba Merge branch 'master' into M21460
# Conflicts:
#	libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd Updates per doc review 2019-04-05 17:10:52 +13:00
Clement
5102702910 Warn mixer about stopped injectors 2019-04-04 18:55:35 -07:00
Shannon Romano
8d6a7c1824
Merge pull request #15318 from roxanneskelly/Case22025
Case 22025 - Create temporary placename doesn't appear when no places are listed
2019-04-04 18:40:13 -07:00
Roxanne Skelly
7f5a595ba7
Merge pull request #15326 from roxanneskelly/Case22059
Lambda capture was referencing something on the local stack
2019-04-04 17:21:53 -07:00
Shannon Romano
82a8a79172
Merge pull request #15229 from ingerjm0/api-docs
JSDoc template and branding changes
2019-04-04 16:51:33 -07:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco
Case 21777: Locomotion Project
2019-04-04 16:18:32 -07:00
Roxanne Skelly
029eab73cb Lambda capture was referencing something on the local stack
which may go out of scope when lambda was called.
2019-04-04 16:00:15 -07:00
ingerjm0
3dbb2b1812 Fix build error for template changes 2019-04-04 15:08:39 -07:00
Ryan Huffman
b9c81a3899
Merge pull request #15322 from huffman/fix/interactive-window-shutdown-crash
Case 18299: Fix ScriptEngine not being destroyed on its own thread
2019-04-04 15:00:50 -07:00
Sam Gateau
bda54c71ea
Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale
Case 22054: flat models can introduce nan into geometry
2019-04-04 14:51:19 -07:00