Ryan Huffman
|
f2474b4d2b
|
Fix lack of ranges on numerical types in Create
|
2019-04-11 14:20:52 -07:00 |
|
Sam Gateau
|
51d1c4b1f3
|
Merge pull request #15357 from SamGondelman/cauterize
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
|
2019-04-10 12:29:40 -07:00 |
|
Sam Gateau
|
c33efdf9e0
|
Merge pull request #15282 from kitely/fix-ray-local-entities
Case 21883: Fix safe landing code improperly finding local entities
|
2019-04-10 12:28:07 -07:00 |
|
Sam Gateau
|
6f4f7335dc
|
Merge pull request #15307 from kencooke/audio-gain-interpolation
Case 22019: Audio clicks/pops when gain is rapidly changing
|
2019-04-10 12:26:59 -07:00 |
|
Sam Gateau
|
89ff63e8bb
|
Merge pull request #15267 from jherico/fix/tracing
Case 21930: Don't change OpenGL context state every frame
|
2019-04-10 09:42:09 -07:00 |
|
SamGondelman
|
a50cca006e
|
use # instead of ? for material URL name selection
|
2019-04-08 23:45:47 -07:00 |
|
SamGondelman
|
27338c3639
|
fix cauterization of entities that are children of MyAvatar's head
|
2019-04-08 19:48:11 -07:00 |
|
luiscuenca
|
0d92ec1f5b
|
Fix comparison warning
|
2019-04-08 11:24:59 -07: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 |
|
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 |
|
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 |
|
luiscuenca
|
39b58a44ee
|
Fix error on sim joints for new flow app
|
2019-04-05 16:38:38 -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 |
|
SamGondelman
|
924bf53698
|
extra check to make sure we remove material from MyAvatar
|
2019-04-05 16:22:16 -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 |
|
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 |
|
Sam Gondelman
|
660818aded
|
Revert "Case 20060: Grab correct stencil masks from display plugins"
|
2019-04-05 11:59:46 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
cf3a9b1d48
|
Fix ScriptEngine not being destroyed on its own thread
|
2019-04-04 13:28:13 -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 |
|
Andrew Meadows
|
72ac35c6f7
|
avoid nan in Model::_scale
|
2019-04-04 08:28:03 -07:00 |
|
r3tk0n
|
17e559f8e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-04-03 16:17:00 -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 |
|
NissimHadar
|
3ba5f8e574
|
Use place holder instead of RCC file.
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
|
2019-04-03 15:25:34 -07:00 |
|
SamGondelman
|
2b376f7881
|
handle weird material name case
|
2019-04-03 14:26:45 -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 |
|
r3tk0n
|
874fb6b6d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-04-03 12:42:33 -07:00 |
|
r3tk0n
|
ac2971894b
|
Fix sprint mode scalar.
|
2019-04-03 11:42:40 -07:00 |
|
SamGondelman
|
cf7230f023
|
fix non-embedded textures
|
2019-04-03 11:26:07 -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 |
|
Andrew Meadows
|
1860e61a30
|
more correct collision group during grabs
|
2019-04-03 07:42:56 -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 |
|
SamGondelman
|
770b863604
|
fixing embedded textures and materialMapping priority
|
2019-04-02 19:04:23 -07:00 |
|
Roxanne Skelly
|
ac97a82bad
|
Address a CR comment.
|
2019-04-02 17:25:00 -07:00 |
|
SamGondelman
|
14bd5ed687
|
remove need for destination path
|
2019-04-02 16:53:49 -07:00 |
|