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 |
|
David Rowe
|
2a17ad3da5
|
AvatarList and AvatarManager JSDoc
|
2019-04-04 10:11:54 +13:00 |
|
Roxanne Skelly
|
75671be2de
|
Case 22025 - Create temporary placename doesn't appear when no places are listed
|
2019-04-03 13:57:37 -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
|
8b670110a9
|
Fix omitted return in MyAvatar::scaleMotorSpeed
|
2019-04-03 13:06:22 -07:00 |
|
Angus Antley
|
857a4ab739
|
enabled MyAvatar.get and .set rotation
|
2019-04-03 13:04:55 -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 |
|
Roxanne Skelly
|
1e4398c950
|
Revert "Temporary crashpad debugging"
This reverts commit df0996cdc9.
|
2019-04-03 11:31:35 -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 |
|
danteruiz
|
5f5e7d5f4e
|
a better fix
|
2019-04-03 10:45:40 -07:00 |
|
Roxanne Skelly
|
df0996cdc9
|
Temporary crashpad debugging
|
2019-04-03 10:17:12 -07:00 |
|
Sam Gateau
|
d0bf102695
|
Merge pull request #15314 from AndrewMeadows/more-correct-collision-groups
Case 20991: more correct collision group during grabs
|
2019-04-03 09:38:30 -07:00 |
|
r3tk0n
|
ec37ad7dc6
|
Address Wayne and Angus' comments on github.
|
2019-04-03 09:38:14 -07:00 |
|
Olivier Prat
|
eadace70f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into amc
|
2019-04-03 18:19:46 +02:00 |
|
Olivier Prat
|
150508dc18
|
Fixed gamma with ETC SRGB8
|
2019-04-03 18:19:27 +02:00 |
|
unknown
|
8dbdee4262
|
better fix for trailing key events
|
2019-04-03 09:08:29 -07:00 |
|
unknown
|
e2387b053b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleContinualTranslateFix
|
2019-04-03 08:33:26 -07:00 |
|
NissimHadar
|
facf8a9305
|
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid
Case 21893: Remove disabling of --url for Android.
|
2019-04-03 07:50:31 -07:00 |
|
NissimHadar
|
813d467f49
|
Ready.
|
2019-04-03 07:43:07 -07:00 |
|
Andrew Meadows
|
1860e61a30
|
more correct collision group during grabs
|
2019-04-03 07:42:56 -07:00 |
|
NissimHadar
|
863fce6321
|
Change version number.
|
2019-04-03 07:42:00 -07:00 |
|
NissimHadar
|
a856d10798
|
Improved error message.
|
2019-04-03 07:39:59 -07:00 |
|
Olivier Prat
|
6b876e6a27
|
Fixed warnings on Mac & Ubuntu
|
2019-04-03 12:05:29 +02:00 |
|
Olivier Prat
|
50fecf5e01
|
Ambient map has different hash than sky map to prevent using one instead of the other, even if they are using the same source texture.
|
2019-04-03 11:29:59 +02:00 |
|
Olivier Prat
|
a79e7a2587
|
Fixed warning
|
2019-04-03 11:18:15 +02:00 |
|
Olivier Prat
|
e3355cd6a4
|
Trying to work uniformly with Image
|
2019-04-03 10:26:39 +02:00 |
|
SamGondelman
|
770b863604
|
fixing embedded textures and materialMapping priority
|
2019-04-02 19:04:23 -07:00 |
|
Roxanne Skelly
|
80683a7b7a
|
Crashpad fix 2nd try
|
2019-04-02 17:35:09 -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 |
|
Roxanne Skelly
|
959b8bfbed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410
|
2019-04-02 16:48:32 -07:00 |
|
Roxanne Skelly
|
b841125b19
|
Case 19858 - crashpad_handler is duplicated outside of the Interface/Sandbox applications on MacOS
|
2019-04-02 16:42:09 -07:00 |
|
danteruiz
|
ff3e5bbc61
|
make sure to delete avatar when thier is no reason
|
2019-04-02 16:20:10 -07:00 |
|
raveenajain
|
fcc7e9af30
|
minor syntax fix
|
2019-04-03 00:09:36 +01:00 |
|
Anthony Thibault
|
dd2f8ff2d6
|
Merge pull request #15309 from hyperlogic/bug-fix/case22010
Case 22010: Bump protocol number to fix joint order mismatch
|
2019-04-02 16:06:11 -07:00 |
|
raveenajain
|
7e5375d40a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning
|
2019-04-02 23:38:19 +01:00 |
|
David Back
|
93fc8e2e18
|
fix continual translation when moving
|
2019-04-02 15:11:32 -07:00 |
|
Ryan Huffman
|
6a16a37339
|
Merge pull request #15286 from huffman/fix/oven-query-param-in-model-url
Case 20928: Fix some URLs with query params not working with model baker
|
2019-04-02 15:03:59 -07:00 |
|
Ryan Huffman
|
ea2e62c1ca
|
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities
Case 20826: Add damping to new dynamic entities in Create
|
2019-04-02 14:28:35 -07:00 |
|
SamGondelman
|
7b0854c121
|
support selecting material in json by name with ?
|
2019-04-02 14:13:00 -07:00 |
|
danteruiz
|
d88a13fc80
|
fix keybaord scaling
|
2019-04-02 13:28:41 -07:00 |
|
Anthony J. Thibault
|
782b8f5da6
|
Case 22010: Bump protocol number to fix joint order mismatch
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
|
2019-04-02 13:26:50 -07:00 |
|
Roxanne Skelly
|
cf9fe00fd6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410
|
2019-04-02 13:21:52 -07:00 |
|
Roxanne Skelly
|
2d71ec1c75
|
Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
|
2019-04-02 13:19:06 -07:00 |
|