Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 09:28:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76798 commits 76 branches 59 tags 1.2 GiB
Commit graph

76798 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SamGondelman
1d6364773d fix crash on startup 2019-03-07 15:26:41 -08:00
Howard Stearns
d309995aef spell domainUnlimited right, and track challenges so that we don't reap 2019-03-07 14:48:57 -08:00
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
Anthony Thibault
0cf8f3e5c3 Code review feed back remove NEW_VERSION ifdef 2019-03-07 14:11:01 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370 
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
 2019-03-07 13:58:51 -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
NissimHadar
684f9929a9 Improved error message. 2019-03-07 12:22:07 -08:00
NissimHadar
8acec5c9e9 Increased threshold to 0.9999 2019-03-07 12:21:40 -08:00
NissimHadar
53d682d40e Merge branch 'master' of github.com:highfidelity/hifi into 21559-increaseComparisonThreshold 2019-03-07 11:32:12 -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
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -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
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -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
Anthony Thibault
c5e9a7d1ab Added unit test for AnimPose() ctor using matrix with negative determinant 2019-03-06 14:26:50 -08:00
Anthony Thibault
5fcfa265d2 Remove alternate versions of AnimPose(mat4) constructor 2019-03-06 14:02:58 -08:00
David Back
cea17985ff new jointRotationOffset field 2019-03-06 13:55:20 -08:00
David Back
9cc1a7aaaa CR changes 2019-03-06 13:44:27 -08:00
David Back
d063825269 export unity material data to materialMap in fst 2019-03-06 13:44:27 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Anthony Thibault
0dbc83049b Make AnimPose from mat4 work better for matrices with negative determinants. 
Took part of this code from glm::decompose() which references
https://opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
 2019-03-06 13:28:14 -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