Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 02:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76880 commits 71 branches 56 tags 1.2 GiB
Commit graph

76880 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Davis
de1513a6dd Turn on KHR_no_error for the quest frame player 2019-03-06 13:22:48 -08:00
Brad Davis
b515a0cceb Support KHR_no_error in the VR wrapper API 2019-03-06 13:15:12 -08:00
Brad Davis
05ba515c73 Support KHR_no_error in the VR context 2019-03-06 13:13:45 -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
Wayne Chen
0d3c13517c
Merge pull request #9 from wayne-chen/pushToTalk 
exposing pushingToTalk setter
 2019-03-06 11:46:42 -08:00
Wayne Chen
96a5cc5563 Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk 2019-03-06 11:45:59 -08:00
Wayne Chen
a318b715c3 exposing setting pushingToTalk 2019-03-06 11:45:43 -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
Wayne Chen
2dd939c85f
Merge pull request #8 from wayne-chen/pushToTalk 
changing micbar display
 2019-03-06 11:22:18 -08:00
Wayne Chen
fb56f4107e
Merge branch 'ptt' into pushToTalk 2019-03-06 11:21:54 -08:00
Wayne Chen
ae8018d242 Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk 2019-03-06 11:19:51 -08:00
Wayne Chen
4467567ee6 changing text display 2019-03-06 11:18:57 -08:00
Brad Davis
72ec0ea29a Update Oculus Mobile SDK to latest version 2019-03-06 11:16:03 -08:00
Wayne Chen
7f585587ff Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-06 11:11:47 -08:00
Wayne Chen
5ffd9bc30b
Merge branch 'ptt' into pushToTalk 2019-03-06 11:07:34 -08:00
Wayne Chen
8b4123b5dc laying groundwork for audio app + fixing deadlocks 2019-03-06 11:00:09 -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
r3tk0n
d88235a08f Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-06 09:40:49 -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
r3tk0n
23e8a8bed4 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-05 17:09:54 -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
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
NissimHadar
ab227f210d Increased threshold to 0.990 2019-03-05 16:21:32 -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
danteruiz
1941e53cc3 track oculus controllers while in oculus home 2019-03-05 15:32:18 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00