Olivier Prat
|
b71a8f7902
|
Switched to split sum model for ambient (as Unreal)
|
2019-04-04 16:10:33 +02:00 |
|
Olivier Prat
|
57de55c5ce
|
Fixed crash in lasterpointer
|
2019-04-04 10:15:38 +02:00 |
|
Olivier Prat
|
acded5488e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into amc
|
2019-04-04 08:58:49 +02:00 |
|
Sam Gateau
|
0d8169bd35
|
Merge pull request #15311 from danteruiz/double-avatars
Case 21415: Avatars stay behind after they disconnect
|
2019-04-03 16:07:35 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Roxanne Skelly
|
ac97a82bad
|
Address a CR comment.
|
2019-04-02 17:25:00 -07:00 |
|
Roxanne Skelly
|
959b8bfbed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410
|
2019-04-02 16:48:32 -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 |
|
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 |
|
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 |
|
raveenajain
|
1435245279
|
root cluster
|
2019-04-02 21:18:16 +01:00 |
|
David Back
|
8de75604cf
|
Merge pull request #15270 from dback2/avatarExporterWarningFixes
Case 20964, 21758: Avatar Exporter v0.4.1 - bone rule fixes
|
2019-04-02 12:20:39 -07:00 |
|
raveenajain
|
8439019c4e
|
update use of vectors
|
2019-04-02 19:56:17 +01:00 |
|
Shannon Romano
|
c5c643f90e
|
Merge pull request #15304 from kitely/fix-invoke-adddelete-wearable
case 22001: Fixed calls to addingWearable() and deletingWearable()
|
2019-04-02 09:09:57 -07:00 |
|
Olivier Prat
|
1aedfff6f7
|
Working convolution
|
2019-04-02 15:40:42 +02:00 |
|
Sam Gondelman
|
414a39bd8a
|
Merge branch 'master' into particleShapes
|
2019-04-01 22:20:13 -07:00 |
|
Shannon Romano
|
cf7eeb7355
|
Merge pull request #15285 from danteruiz/avatar-fading
Case 21415: Avatars stay behind after they disconnect
|
2019-04-01 18:04:42 -07:00 |
|
danteruiz
|
8115ef6d36
|
addressing more requested changes
|
2019-04-01 16:46:15 -07:00 |
|
Shannon Romano
|
c865969b5f
|
Merge pull request #15306 from highfidelity/wayne-chen-patch-1
Case 22014: Audio Mic Bar not muting/unmuting correctly
|
2019-04-01 16:26:20 -07:00 |
|
danteruiz
|
fcb838a71f
|
addressing review requests
|
2019-04-01 15:43:04 -07:00 |
|
Shannon Romano
|
1bfa0397f0
|
Merge pull request #15048 from wayne-chen/newAudioMuteStates
Case 21899: New Audio Mute States
|
2019-04-01 15:27:03 -07:00 |
|
Wayne Chen
|
8df34e5d59
|
fixing on clicked for audio mic bar
|
2019-04-01 14:50:16 -07:00 |
|
Wayne Chen
|
a9802570d7
|
Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml
Case 22003: Reuse Blank Space from Volume Slider
|
2019-04-01 14:23:27 -07:00 |
|
Shannon Romano
|
04eac57950
|
Merge pull request #15300 from jherico/fix/web_camera_master
Case 21993: Globally disallow use of the camera or microphone by hosted web content
|
2019-04-01 14:05:22 -07:00 |
|
raveenajain
|
ce6f2b7bcc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning
|
2019-04-01 21:48:55 +01:00 |
|
raveenajain
|
2920fdc966
|
variables, cluster size
|
2019-04-01 21:09:14 +01:00 |
|
Wayne Chen
|
abe5748e60
|
Merge branch 'master' into newAudioMuteStates
|
2019-04-01 12:24:46 -07:00 |
|
Wayne Chen
|
afdf95c894
|
remove unused slotted function
|
2019-04-01 12:20:55 -07:00 |
|
Wayne Chen
|
eba1f271ef
|
Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master
Case 21892: Mac Audio Push To Talk fix
|
2019-04-01 12:19:10 -07:00 |
|
Wayne Chen
|
0a8d195f6f
|
adding top padding for my name card
|
2019-04-01 11:32:52 -07:00 |
|