Daniela
e264503b9f
Merge remote-tracking branch 'upstream/master'
2017-09-26 17:49:15 +01:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Sam Gateau
ff1101cc69
Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix
...
Experimental Fix: Entity Shader Lightmap use / emissive
2017-09-26 09:39:33 -07:00
Menithal
19a290be70
Fixed Entity Shader emmissive
...
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
2017-09-26 00:12:45 +03:00
Sam Gateau
191066a111
Merge pull request #11452 from SamGondelman/pos3D
...
Fix pointer event properties
2017-09-25 11:49:54 -07:00
SamGondelman
a73fdf4397
fix pointer event properties
2017-09-25 10:19:42 -07:00
Brad Hefta-Gaub
030da7d850
Merge pull request #11401 from druiz17/module-scale-entities
...
ScaleEntity Module
2017-09-25 09:10:32 -07:00
Andrew Meadows
cf0dd6f8c3
Merge pull request #11371 from cain-kilgore/21542
...
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691
Merge pull request #11436 from SamGondelman/missingModels
...
Fix missing models
2017-09-23 13:56:50 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
Sam Gateau
d68577be7e
Merge pull request #11441 from SamGondelman/glowAlpha
...
Fix alpha on Line3DOverlays with glow
2017-09-22 17:17:23 -07:00
SamGondelman
86198606e0
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
2017-09-22 17:12:44 -07:00
Zach Fox
702a4e9ade
More tweaking to overlay position
2017-09-22 15:32:38 -07:00
Zach Fox
0eafdeab14
Fix hover -> unhover overlay behavior
2017-09-22 13:32:11 -07:00
SamGondelman
bc477608ee
fix alpha on glowLines
2017-09-22 13:22:08 -07:00
Ryan Huffman
883bdc6003
Merge pull request #11425 from Atlante45/feat/auto-bake
...
Asset Browser auto-refresh
2017-09-22 13:17:04 -07:00
Zach Fox
e3f2e70bca
No magic numbers
2017-09-22 11:43:56 -07:00
Zach Fox
430d1b22bb
Update angular size and i behavior
2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -07:00
Anthony Thibault
20cb02dabb
Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering
...
Fix for TextEntity rendering, the translation was incorrect
2017-09-22 11:19:24 -07:00
Seth Alves
e7f9898517
Merge pull request #11437 from jherico/fix/web_render_size
...
Fix dimensions of rendered web entities
2017-09-22 11:14:14 -07:00
SamGondelman
be27376c52
add comment about bottleneck
2017-09-22 10:21:32 -07:00
Anthony J. Thibault
d3c60f3057
Fix for TextEntity rendering, the translation was incorrect
...
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
2017-09-22 09:44:51 -07:00
Brad Davis
549cb77902
Fix dimensions of rendered web entities
2017-09-21 20:59:01 -07:00
Atlante45
8583be41ce
Don't refresh if not connected to the Asset Server
2017-09-21 18:57:09 -07:00
Clément Brisset
ecca1fea93
Merge pull request #11434 from Atlante45/fix/running-scripts-tablet
...
Fix RunningScripts in tablet mode
2017-09-21 18:55:20 -07:00
Clément Brisset
c64f709380
Merge pull request #11435 from Atlante45/fix/use-after-free
...
Fix use after free in deleteMappings
2017-09-21 18:45:29 -07:00
SamGondelman
9f12d3a365
fix missing models
2017-09-21 17:57:25 -07:00
Cain Kilgore
0d33976035
Real time changes
2017-09-22 00:38:30 +01:00
Atlante45
a4b9945226
Fix use after free in deleteMappings
2017-09-21 16:22:51 -07:00
Atlante45
6cdbf0c44a
Fix RunningScripts in tablet mode
2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991
Add Asset Server auto refresh
2017-09-21 14:41:59 -07:00
Ryan Huffman
abbe263142
Fix FBXBaker not properly handling textures with the same name
2017-09-21 13:40:39 -07:00
Ken Cooke
84786ac8e3
Merge pull request #11424 from ctrlaltdavid/21548
...
Fix recording just made not playing back if reload it
2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a
Coding standard
2017-09-22 07:13:32 +12:00
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
Daniela
d054c6dc36
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 18:29:45 +01:00
Daniela
adde847798
Fix code standard.
2017-09-21 17:57:02 +01:00
Seth Alves
61efaf7fc2
Merge pull request #11420 from druiz17/fix-parenting-overlay-module
...
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
2017-09-21 09:44:07 -07:00
Zach Fox
81be62b6f7
Check if ContextOverlayInterface is enabled before highlighting
2017-09-21 09:34:15 -07:00
Daniela
9787c31d70
Fix protect color pick from wrong user input.
2017-09-21 17:17:36 +01:00
druiz17
65e0c99618
small change
2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba
fixing merge conflicts
2017-09-21 09:04:13 -07:00
Sam Gateau
11dd4d2945
Merge pull request #11353 from jherico/clean_runtime
...
Remove old versions of the VC Runtime from the installation directory
2017-09-21 09:02:57 -07:00
Andrew Meadows
6b3b3a7448
Merge pull request #11382 from ElderOrb/case6618
...
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Andrew Meadows
fcff198b61
Merge pull request #11410 from humbletim/21545
...
WL 21545: Fix up the doppleganger mirror script
2017-09-21 08:47:24 -07:00
Andrew Meadows
b803344f0c
Merge pull request #11421 from jherico/fix/transform_log_spam
...
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
Daniela
d960a7c42e
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 16:20:51 +01:00
Daniela
7ccfac0b3b
Protect stroke width from wrong user input. Protect color pick from wrong user input.
2017-09-21 15:54:53 +01:00
