Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android
...
Android updates
2018-01-23 14:41:35 -08:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c
Take defaultPoseFlag section into account when computing byteArraySize.
2018-01-22 14:57:09 -08:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
...
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
...
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
Anthony J. Thibault
52f1803ea8
code review feedback
2018-01-22 09:55:39 -08:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix
...
Fix sortOrder param on tablet buttons
2018-01-21 10:40:25 -08:00
luiscuenca
b0f21c6931
sorter variable names
2018-01-20 07:09:16 -07:00
Brad Davis
d2fe9e2710
PR feedback
2018-01-19 20:24:34 -08:00
Bruce Brown
cbc8698e9a
Fix Bitwise operators.
2018-01-19 16:59:47 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces"
2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
...
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
luiscuenca
41f3b792b6
Fix warnings
2018-01-19 14:34:52 -07:00
Bruce Brown
fab13a111c
Remove accidental -
2018-01-19 13:10:34 -08:00
David Rowe
24dcc8788c
Code review
2018-01-20 10:07:23 +13:00
John Conklin II
c366ed42ab
Merge pull request #12202 from amantley/urlbug
...
added a property check in renderableModelEntity for the animation url…
2018-01-19 12:52:43 -08:00
David Rowe
94e6a68d41
Code review
2018-01-20 09:50:24 +13:00
Bruce Brown
39e938ccc7
Removed Tabs & CR/LF
2018-01-19 11:52:09 -08:00
Brad Davis
e2c4af05bd
Don't process empty images
2018-01-19 11:42:31 -08:00
Brad Davis
104dbabee9
Infinite loop guard
2018-01-19 11:42:13 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Sam Gateau
9a8246f2b9
Merge pull request #12215 from Zvork/brdf
...
Normalized diffuse & specular for directional, point and spot lights
2018-01-19 11:08:29 -08:00
Seth Alves
63cd472fca
Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags
...
fix race condition whereby physics may incorrectly overwrite script/network property change
2018-01-19 11:06:22 -08:00
Brad Davis
d6f7b23b2d
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 10:37:41 -08:00
luiscuenca
27ea74f5bf
Fix sortOrder param on tablet buttons
2018-01-19 11:22:37 -07:00
Sam Gateau
ce550b4fa6
Merge pull request #12209 from SamGondelman/textures
...
Watch for attachment texture loading
2018-01-19 10:08:04 -08:00
Olivier Prat
12c48a38f7
Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials.
2018-01-19 13:58:35 +01:00
Bruce Brown
3004ee08e1
Fix lockup when no midi devices present.
2018-01-18 21:18:36 -08:00
David Rowe
fb684909ce
Merge branch 'master' into 21703
2018-01-19 17:25:12 +13:00
David Rowe
e0e6fc711b
Replace Pointers API function setNonHoverItems() with setDoesHover()
2018-01-19 16:05:09 +13:00
Alexander Ivash
67e816756c
make gcc happy
2018-01-19 01:51:41 +00:00
Andrew Meadows
75b5635d2f
less word salad
2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3
check dirty flags when harvesting physics results
2018-01-18 17:43:22 -08:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
Elisa Lupin-Jimenez
42b8c293d6
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name
...
Fixed typo in macro name
2018-01-18 14:44:43 -08:00
Brad Hefta-Gaub
61a5750b09
Merge pull request #12204 from druiz17/fix-dynamic-entities-not-colliding
...
Fix dynamic entities not colliding with avatar when a grab action is removed
2018-01-18 14:39:21 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number
...
fix sparse rectification for small textures, export for same model at diff URL
2018-01-18 14:25:33 -08:00
amantley
961ed88fb0
fixed coding standards in RenderableModelEntityItem.cpp
2018-01-18 12:56:24 -08:00
SamGondelman
c8aded0688
watch for attachment texture loading
2018-01-18 12:40:02 -08:00
Alexander Ivash
50217726c0
remove extra qualification from DesktopPreviewProvider::getInstance() in .h
2018-01-18 23:26:43 +03:00
Alexander Ivash
be3789e70a
show warning on attempt to force 'VSYNC' preview reason
2018-01-18 23:26:43 +03:00
Alexander Ivash
576ae227a8
move imagePaths into .h so simplify matching enum values to image files
2018-01-18 23:26:43 +03:00
Alexander Ivash
744da710a3
move VSYNC into 'PreviewDisabledReasons' enum
2018-01-18 23:26:43 +03:00
Alexander Ivash
a74b093b60
FB11109 Preview disabled image swap (Commerce only)
2018-01-18 23:26:43 +03:00
amantley
1c97272767
Cleaned up the code a bit so that there is no need for a new class variable for properties to verify the change of url
2018-01-18 12:09:28 -08:00
David Rowe
8c2427dd58
Rename Window.protocolVersion() to Window.protocolSignature()
2018-01-19 09:06:16 +13:00
