Thijs Wenker
|
174e9d3915
|
Merge pull request #14940 from dback2/fixAvatarExporterGitIgnore
Case 21273: Avatar Exporter - fix .gitignore to include all unneeded files
|
2019-03-08 00:48:44 +01:00 |
|
Shannon Romano
|
76958ffda2
|
Merge pull request #15102 from danteruiz/keyboard-for-web-entities
Case 21144: Can't enter text in a Web Entity with the new keyboard
|
2019-03-07 15:46:31 -08:00 |
|
Shannon Romano
|
ab08b56bd1
|
Merge pull request #15085 from danteruiz/keyboard-handle-scaling
Case 21500: Keyboard handle appears huge when scaling down avatar
|
2019-03-07 15:39:43 -08:00 |
|
Shannon Romano
|
37727c8b60
|
Merge pull request #14938 from dback2/draggableNumberDisabled
Case 20662: Entity Properties - fix disabling draggable numbers
|
2019-03-07 15:33:21 -08:00 |
|
Shannon Romano
|
8be93fd16c
|
Merge pull request #14891 from kencooke/glm-pack-normals-speedup
Case 21114: SIMD optimized blendshape packing
|
2019-03-07 15:28:40 -08:00 |
|
John Conklin II
|
9a4b95faa2
|
Merge pull request #15111 from luiscuenca/flowDataOnFst
Load flow bone data from FST file
|
2019-03-07 12:48:36 -08:00 |
|
John Conklin II
|
abb61b7e90
|
Merge pull request #15124 from SamGondelman/shapes
Case 21605: Fix shapes app and debugAvatarMixer
|
2019-03-07 11:07:45 -08:00 |
|
Howard Stearns
|
ab8f6273ad
|
Merge pull request #15113 from howard-stearns/stock-to-master
Stock to master
|
2019-03-07 11:02:53 -08:00 |
|
Anthony Thibault
|
96a696203c
|
Merge pull request #15101 from amantley/bugAvatarHovers
Fixed: Avatar hovers off ground while running
|
2019-03-07 10:52:20 -08:00 |
|
Shannon Romano
|
d11c04a19d
|
Merge pull request #15117 from SamGondelman/wearables
Case 21596: Fix wearable scale on position change
|
2019-03-07 10:29:47 -08:00 |
|
Sam Gateau
|
6841668040
|
Merge pull request #15071 from NissimHadar/21507-replaceQNetworkAccessManagerWithPython
Case 21507: replace Qt network access manager with python
|
2019-03-07 10:04:26 -08:00 |
|
Sam Gondelman
|
dc4e2645da
|
even better!
|
2019-03-07 08:05:32 -08:00 |
|
SamGondelman
|
380df059ff
|
fix shapes app
|
2019-03-06 18:18:39 -08:00 |
|
amantley
|
fcf1e34175
|
Merge pull request #15114 from amantley/ikEnabledFix
Ik enabled fix
|
2019-03-06 20:29:38 -05:00 |
|
Shannon Romano
|
d068630728
|
Merge pull request #15108 from sabrina-shanman/crash_physics-fst
(case 21585) Fix crash when FST model used as both graphics and physics model
|
2019-03-06 17:06:38 -08:00 |
|
SamGondelman
|
96eb137df2
|
fix debugAvatarMixer.js
|
2019-03-06 15:53:25 -08:00 |
|
amantley
|
474a97d0fc
|
now update the ikOverlayAlpha every frame
|
2019-03-06 15:15:30 -08:00 |
|
SamGondelman
|
0f3e1b9157
|
fix wearable scale on position change
|
2019-03-06 14:53:21 -08:00 |
|
Howard Stearns
|
c6b2697b44
|
cleanup
|
2019-03-06 13:28:55 -08:00 |
|
Howard Stearns
|
8ebab88613
|
Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master
|
2019-03-06 13:08:19 -08:00 |
|
Roxanne Skelly
|
a54171d60c
|
Merge pull request #15104 from roxanneskelly/79hero-master
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
|
2019-03-06 13:06:45 -08:00 |
|
NissimHadar
|
4e7f558af8
|
Merge branch 'master' of github.com:highfidelity/hifi into 21507-replaceQNetworkAccessManagerWithPython
|
2019-03-06 13:02:36 -08:00 |
|
Shannon Romano
|
fc2f1ff994
|
Merge pull request #14955 from thoys/fix/create/reloadCrash
Case 18299: Remove workaround for Interactive window crash now that it is fixed
|
2019-03-06 12:46:00 -08:00 |
|
Shannon Romano
|
bde6ced7c8
|
Merge pull request #15049 from thoys/fix/fst/materialRelativePaths
Case 21474: relative paths in FST material parsing
|
2019-03-06 12:38:13 -08:00 |
|
Shannon Romano
|
3600b98bd0
|
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
Case 21340: avatar doctor project page status
|
2019-03-06 12:36:18 -08:00 |
|
amantley
|
e72cc8b16e
|
put the ik optimized part of the conditional inside a android build define statement
|
2019-03-06 12:09:53 -08:00 |
|
Sam Gateau
|
f203d71159
|
Merge pull request #15069 from NissimHadar/21482-addSSIMResultsImage
Case 21482: add SSIM results image
|
2019-03-06 12:01:33 -08:00 |
|
Howard Stearns
|
ddfd437696
|
ensure error message when marketplace update fails
|
2019-03-06 11:37:17 -08:00 |
|
Howard Stearns
|
366dd935dd
|
trading in has nothing to do with whether you own the new item
|
2019-03-06 11:36:34 -08:00 |
|
Howard Stearns
|
416cde4c1f
|
fix uses of updated_item_id that got lost
|
2019-03-06 11:36:08 -08:00 |
|
Howard Stearns
|
f5afc2033f
|
work through stocking vs update issues, and cleanup
|
2019-03-06 11:35:36 -08:00 |
|
Thijs Wenker
|
a84a43320c
|
added spacing between lines
|
2019-03-06 19:15:01 +01:00 |
|
amantley
|
48f512a553
|
Merge remote-tracking branch 'upstream/master' into ikEnabledFix
|
2019-03-06 10:07:28 -08:00 |
|
luiscuenca
|
dfb434ea09
|
Fix warning and refactoring
|
2019-03-06 09:25:49 -07:00 |
|
Thijs Wenker
|
59200103af
|
Not for sale explanation
|
2019-03-06 07:06:48 +01:00 |
|
luiscuenca
|
beeeb74f17
|
Fix creation date
|
2019-03-05 18:56:02 -07:00 |
|
luiscuenca
|
76609197e2
|
Read flow data from the fst file
|
2019-03-05 18:50:53 -07:00 |
|
amantley
|
442da66583
|
debugging tiny hulk problems
|
2019-03-05 17:44:36 -08:00 |
|
sabrina-shanman
|
7ad8b3a610
|
Fix FST models being copied improperly in the ModelCache
|
2019-03-05 16:59:36 -08:00 |
|
Anthony Thibault
|
7585391642
|
Merge pull request #15031 from luiscuenca/upVectorFBXFix
Read and apply the upVector parameter when importing FBX files
|
2019-03-05 16:27:42 -08:00 |
|
Shannon Romano
|
4f3d593d90
|
Merge pull request #15072 from SamGondelman/clear
Case 11775: Don't clear my avatar entities on domain switch
|
2019-03-05 15:42:51 -08:00 |
|
Roxanne Skelly
|
fae6393663
|
Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42'
|
2019-03-05 15:11:25 -08:00 |
|
Roxanne Skelly
|
cca36e4a89
|
Merge commit '135c7b667eb126bcc4ebab948fa7450327209ae8'
|
2019-03-05 15:09:56 -08:00 |
|
Roxanne Skelly
|
d0ecc6d792
|
Merge commit '16eb3444c11c6513ff0d8a1d73a50c9856bf432b'
|
2019-03-05 15:09:20 -08:00 |
|
Roxanne Skelly
|
38981a5f25
|
Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36'
|
2019-03-05 15:08:39 -08:00 |
|
Roxanne Skelly
|
3ef02085ff
|
Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'
|
2019-03-05 15:07:49 -08:00 |
|
danteruiz
|
e6a63a9a69
|
add keyboard for html content
|
2019-03-05 14:24:38 -08:00 |
|
Sam Gondelman
|
94cc5b83ac
|
Merge pull request #15088 from SamGondelman/create
Case 21541: Fix mouse on create in HMD
|
2019-03-05 13:07:49 -08:00 |
|
Shannon Romano
|
3eff5d269f
|
Merge pull request #15008 from ctrlaltdavid/M21128-a
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
|
2019-03-05 11:58:37 -08:00 |
|
John Conklin II
|
4729c8737e
|
Merge pull request #15095 from amerhifi/master
case 21563: adding modelScale initialization so that it does not fail the validSc…
|
2019-03-05 11:46:32 -08:00 |
|