Sam Gondelman
|
f013b9af2b
|
fix warnings
|
2019-03-13 00:24:19 -07:00 |
|
SamGondelman
|
609c4ab52e
|
try to fix audio injector threading issues
|
2019-03-12 18:41:43 -07:00 |
|
Shannon Romano
|
c0240d2431
|
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
|
2019-03-11 15:33:32 -07:00 |
|
Shannon Romano
|
864c37d310
|
Merge pull request #15155 from sethalves/fix-clonables
Fix cloneables
|
2019-03-11 14:17:20 -07:00 |
|
Shannon Romano
|
801306364a
|
Merge pull request #15148 from samcake/rc81-hero
Case 21639: RC81: Adding Hero support in simulation of avatars
|
2019-03-11 14:13:49 -07:00 |
|
Seth Alves
|
e515e9cc66
|
fix cloneEntity function
|
2019-03-11 12:38:54 -07:00 |
|
Seth Alves
|
2fb5e1ebc2
|
quiet some logging
|
2019-03-11 12:36:29 -07:00 |
|
Shannon Romano
|
a7e3495cfb
|
Merge pull request #15152 from roxanneskelly/Case21326
Case 21326 - missing marketplaceInject.js
|
2019-03-11 12:22:03 -07:00 |
|
Roxanne Skelly
|
e4e8a61328
|
Case 21326 - missing marketplaceInject.js
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
|
2019-03-11 10:46:51 -07:00 |
|
Bradley Austin Davis
|
0e46007d84
|
Merge pull request #15116 from jherico/fix/oculus_sdk_update
Case 21595: Oculus SDK Update
|
2019-03-08 23:53:06 -08:00 |
|
Sam Gateau
|
3464fe09c1
|
Applying the hero changes to master soon to be rc81
|
2019-03-08 18:13:20 -08:00 |
|
Anthony Thibault
|
c36d752b6b
|
Merge pull request #15141 from luiscuenca/flowAPIExtra
add getFlowData method to MyAvatar
|
2019-03-08 17:45:11 -08:00 |
|
Shannon Romano
|
ca87e217bd
|
Merge pull request #15097 from wayne-chen/audioSettingsModified
Case 21562: Audio settings screen
|
2019-03-08 16:22:52 -08:00 |
|
luiscuenca
|
80150565f6
|
Fix bug on group settings
|
2019-03-08 16:30:28 -07:00 |
|
Shannon Romano
|
c3b8f6ed93
|
Merge pull request #15145 from roxanneskelly/StandaloneTags
Case 21642 - verification dialog when user hits return in goto search
|
2019-03-08 15:29:34 -08:00 |
|
Howard Stearns
|
1d52ed1524
|
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox
do not scroll inventory items underneath modal dialog
|
2019-03-08 15:27:44 -08:00 |
|
Howard Stearns
|
fac162c2bc
|
Merge pull request #15144 from howard-stearns/about-blockchain
Change "about" blockchain from Elements to EOS
|
2019-03-08 15:17:31 -08:00 |
|
John Conklin II
|
e69eda8e84
|
Merge pull request #15137 from thoys/fix/unityAvatarExporter/allowOptimizedRigs
Case 21069: Avatar Exporter v0.3.3 - temporary de-optimize game objects during the export process
|
2019-03-08 15:05:59 -08:00 |
|
luiscuenca
|
df32b61eaf
|
remove unused variable
|
2019-03-08 16:01:18 -07:00 |
|
Shannon Romano
|
a8f6e74ca4
|
Merge pull request #15135 from SamGondelman/text81
Case 21628: Fix text rendering on AMD/Mac
|
2019-03-08 14:59:37 -08:00 |
|
luiscuenca
|
bfcb1a8391
|
Make methods thread safe
|
2019-03-08 15:57:25 -07:00 |
|
Shannon Romano
|
cc154be12d
|
Merge pull request #15090 from danteruiz/oculus-tracking-controllers
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
|
2019-03-08 14:56:56 -08:00 |
|
Thijs Wenker
|
ded58b96f0
|
Merge pull request #15139 from huffman/feat/tga-textures
Case 21220: Add more complete support for .tga files
|
2019-03-08 23:53:21 +01:00 |
|
Thijs Wenker
|
60d46998ec
|
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
|
2019-03-08 23:51:58 +01:00 |
|
Anthony Thibault
|
aa3b27d89e
|
Merge pull request #15143 from amantley/bugShadowNames2
loading jointRotationOffset2 from FST and deal with the shadow joints
|
2019-03-08 14:37:30 -08:00 |
|
Roxanne Skelly
|
b3f5d76d0f
|
CR Fix
|
2019-03-08 14:37:15 -08:00 |
|
Howard Stearns
|
8791252acd
|
do not scroll inventory items underneath modal dialog
|
2019-03-08 14:27:56 -08:00 |
|
Thijs Wenker
|
63c0df9945
|
temporary de-optimize game objects during the export process
|
2019-03-08 23:18:56 +01:00 |
|
John Conklin II
|
b80421ccf2
|
Merge pull request #15118 from dback2/avatarExporterDuplicateJointNames
Case 21060: Avatar Exporter v0.3.2 - New jointRotationOffset field
|
2019-03-08 14:13:44 -08:00 |
|
Thijs Wenker
|
06e5927ee1
|
CR fixes
|
2019-03-08 23:07:01 +01:00 |
|
Roxanne Skelly
|
88a4b5c983
|
Case 21642 - verification dialog when user hits return in goto search
text entry+return should throw up verification dialog for first time to
non-optimized domain
|
2019-03-08 14:01:47 -08:00 |
|
Ryan Huffman
|
62f17acaf7
|
Fix warnings in TGAReader
|
2019-03-08 14:01:29 -08:00 |
|
Howard Stearns
|
24b08bd25d
|
Change "about" blockchain from Elements to EOS
|
2019-03-08 13:59:16 -08:00 |
|
luiscuenca
|
4858f64810
|
get the colliding joints
|
2019-03-08 14:36:47 -07:00 |
|
Shannon Romano
|
173186c878
|
Merge pull request #15142 from roxanneskelly/StandaloneTags
Case 21010 - Tag domains and marketplace items as stand-alone device optimized
|
2019-03-08 13:30:14 -08:00 |
|
Ryan Huffman
|
1f0a8b18c8
|
Fix warning about TGAOrientation
|
2019-03-08 13:01:56 -08:00 |
|
Roxanne Skelly
|
70cc6594c7
|
CR fixes
|
2019-03-08 12:43:43 -08:00 |
|
luiscuenca
|
f363d95ca2
|
clear group settings on init
|
2019-03-08 13:02:47 -07:00 |
|
Ryan Huffman
|
2af9dc886a
|
Add logging category to TGAReader
|
2019-03-08 11:56:04 -08:00 |
|
amantley
|
6b18b22433
|
loading jointRotationOffset2 from FST and deal with the shadow joints
|
2019-03-08 11:53:12 -08:00 |
|
luiscuenca
|
cbe920774f
|
add getFlowData jsdoc
|
2019-03-08 12:45:29 -07:00 |
|
luiscuenca
|
cb6f573b35
|
Merge branch 'master' into flowAPIExtra
|
2019-03-08 12:43:02 -07:00 |
|
Roxanne Skelly
|
c33d2aafda
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-03-08 11:41:34 -08:00 |
|
luiscuenca
|
a977bb6dc8
|
remove unuse variable
|
2019-03-08 12:39:57 -07:00 |
|
Howard Stearns
|
986cc005f1
|
Merge pull request #15136 from SimonWalton-HiFi/hero-zones-collision-shape
Fix mixer crash with Zones that have compound shapes (master)
|
2019-03-08 11:27:33 -08:00 |
|
Roxanne Skelly
|
750dbfae21
|
Stand-alone Tags: Throw up popup for first unoptimized domain
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
|
2019-03-08 10:48:42 -08:00 |
|
Roxanne Skelly
|
e94d248ac5
|
Merge pull request #15126 from howard-stearns/domainUnlimited
unlimited certified copies in a domain
|
2019-03-08 10:23:42 -08:00 |
|
Ryan Huffman
|
c55811ced5
|
Add support for TGA orientation
|
2019-03-08 09:47:35 -08:00 |
|
Ryan Huffman
|
5fd2b0699a
|
Add more complete support for .tga files
|
2019-03-08 09:47:35 -08:00 |
|
luiscuenca
|
e8da6b5a0c
|
add getFlowData
|
2019-03-08 10:36:58 -07:00 |
|