Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 12:51:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76808 commits 75 branches 59 tags 1.2 GiB
Commit graph

76808 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
amantley
8e9618d740 added a lower run animation to stop hovering when running 2019-03-05 11:44:53 -08:00
Sam Gondelman
fd5e2b4672
Merge pull request #15082 from SamGondelman/modelCrash 
Case 21528: Possible fix for model crash
 2019-03-05 11:27:46 -08:00
Wayne Chen
2020b757a3 adding mic glyph 2019-03-05 10:58:26 -08:00
Wayne Chen
f1cf11de85 moving gain slider to audio settings 2019-03-05 10:53:55 -08:00
amer cerkic
fab343a1d4 correcting spacing 2019-03-05 10:52:54 -08:00
amer cerkic
36e9c604e9 fixed based on comment 2019-03-05 10:45:15 -08:00
NissimHadar
66125e1f01 Updated version. 2019-03-05 10:21:49 -08:00
amer cerkic
29a308dcaa adding modelScale initialization so that it does not fail the validScale check assert 2019-03-05 10:07:33 -08:00
Simon Walton
743d1a58e2 Style tweaks from review 2019-03-05 09:34:29 -08:00
Wayne Chen
a00d6ec9f6 removing debug statement 2019-03-04 19:42:30 -08:00
Wayne Chen
0f2792930a adding switches and buttons to testing audio 2019-03-04 19:28:12 -08:00
Simon Walton
122b62a5b8 Remove some debug output 2019-03-04 17:32:18 -08:00
SamGondelman
f2c248c0a2 disable href and entity script events when in edit mode 2019-03-04 17:10:20 -08:00
Wayne Chen
a68aaaa7a4 adding timer and ui color changes 2019-03-04 16:06:50 -08:00