Commit graph

76711 commits

Author SHA1 Message Date
Shannon Romano
29960cfd5c
Merge pull request #15009 from ingerjm0/api-docs
Add custom JSDoc template, add @signal tag
2019-03-07 16:07:50 -08:00
Shannon Romano
343e2648bb
Merge pull request #15131 from danteruiz/destroy-modal-dialogs
Case 15127: Esc key doesn't consistently set my avatar to 'Away' mode
2019-03-07 16:06:33 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
2019-03-07 16:04:57 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo
Case 21603: Tablet x button is nearly impossible to hit with stylus
2019-03-07 16:03:13 -08:00
Shannon Romano
b567fd6cac
Merge pull request #15105 from danteruiz/disable-entity-scaling
Case 20830: Disable entity scaling while grabbing
2019-03-07 16:01:34 -08:00
Thijs Wenker
db4a33e24a
Merge pull request #14967 from dback2/avatarExporterRootName
Case 21073: Avatar Exporter v0.3 - use root bone name from skeleton list
2019-03-08 00:58:22 +01:00
Shannon Romano
9964666ec6
Merge pull request #15112 from jherico/fix/android_quest_version_code
Add the version code to the Quest android build
2019-03-07 15:55:07 -08:00
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
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -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
danteruiz
05dc30a740 more requested changes 2019-03-07 10:49:37 -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
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -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
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08: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
Brad Davis
d4cea6009f Add the version code to the Quest android build 2019-03-06 10:45:13 -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