Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
73589 commits 2 branches 0 tags 1.1 GiB
Commit graph

73589 commits

This branch
This branch
All branches
Author SHA1 Message Date
sabrina-shanman
4d9c20343a Link shared library in hfm 2018-11-07 11:44:58 -08:00
Clement
65a83cb026 Resend solo nodes on mixer reconnect 2018-11-07 11:41:04 -08:00
Jeff Clinton
63bf077776
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-11-07 11:19:55 -08:00
Sam Gateau
e6cd9a4ffa
Merge pull request #14301 from NissimHadar/fixPath 
case 19636 - Make path to VCPKG relative  to ENV variable
 2018-11-07 10:58:56 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial 
Case 19682: Disable interstitial on android
 2018-11-07 10:47:31 -08:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix 
Case 19686: Possibly fix mac debug deferred issue
 2018-11-07 10:33:41 -08:00
Sam Gateau
8cda3f729b
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar 
Case 19394: always keep entities near MyAvatar in physics simulation
 2018-11-07 10:26:47 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock 
Case 19735: Fix ResourceCache mutex issues
 2018-11-07 09:55:41 -08:00
sabrina-shanman
2c94d1f620 Fix hfm not linking in script-engine for Android build 2018-11-07 09:24:42 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
Simon Walton
f88168bdfb Send avatar-joint translations at world scale 2018-11-06 17:29:02 -08:00
sabrina-shanman
8b37133875 Remove unnecessary draco dependency from hfm library 2018-11-06 17:10:44 -08:00
sabrina-shanman
906fc1a425 Fix Android build not linking hfm library 2018-11-06 16:38:36 -08:00
SamGondelman
887c4f108f high detail not low 2018-11-06 16:34:16 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage" 2018-11-06 16:10:49 -08:00
SamGondelman
e20aeb28eb force low detail on oculus first run 2018-11-06 15:58:35 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
sabrina-shanman
e654ff9bbc Remove forward declaration in HFM.h so ModelPackager and other things can use it instead 2018-11-06 14:53:23 -08:00
sabrina-shanman
70c9db38ef Do not reference HFM inside the hfm namespace 2018-11-06 14:13:48 -08:00
sabrina-shanman
8fa72396ef Consolidate HFM class implementations into source file and move model 
logging.
 2018-11-06 14:05:36 -08:00
Howard Stearns
05becb870f remove urls from logs in Interface 2018-11-06 13:47:07 -08:00
Clement
b8cb433fa1 Spelling 2018-11-06 13:39:36 -08:00
Clement
beb575a88d Don't attenuate soloed nodes. 2018-11-06 13:39:24 -08:00
Clement
0ca0a6f3be Fix JSDoc arrays 2018-11-06 12:57:17 -08:00
Andrew Meadows
91f6a5057a correct capsule height when building btCapsuleShape 2018-11-06 12:54:56 -08:00
Zach Fox
378bf911d4 Fix another build error 2018-11-06 12:48:17 -08:00
Andrew Meadows
b38c263e60 use correct capsule dimensions in teleport.js 2018-11-06 12:44:14 -08:00
Andrew Meadows
6ecf850159 clarify ShapeInfo::setCapsuleY() API and use it correctly 2018-11-06 12:37:55 -08:00
David Rowe
629559e78c Add extra ()s 2018-11-07 09:20:54 +13:00
David Rowe
f47f77b181 Fix mini tablet JavaScript crash 2018-11-07 09:11:43 +13:00
Clement
4e802b0f3f Add JSDoc comments 2018-11-06 11:59:15 -08:00
SamGondelman
1444b3a186 resource mutex issues 
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
 2018-11-06 11:57:57 -08:00
sabrina-shanman
1a69afb3e8 Move HFM.h to hfm subfolder per convention 2018-11-06 11:43:19 -08:00
Zach Fox
c33f9b6ea3 Fix build error 2018-11-06 11:26:09 -08:00
Zach Fox
53742e90f5 Cleanup after merge 2018-11-06 10:30:10 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
luiscuenca
0f1b12475e Use clamp 2018-11-06 10:15:17 -07:00
luiscuenca
0f183b409b Fix warnings 2018-11-06 10:08:06 -07:00
Alexander Ivash
a3dfc873b7 rsolve rebase conflict 2018-11-06 14:21:14 +05:30
Alexander Ivash
4c6700b497 remove deprecations warnings 2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416 change imports (how could I miss this place?) 2018-11-06 14:21:14 +05:30
Alexander Ivash
fe4e4cfbd4 return controls-uit & styles-uit folders to preserve backward-compatibility 2018-11-06 14:21:14 +05:30
Alexander Ivash
f7d9bafc7d add FilterBar & ScrollBar to qmldir 2018-11-06 14:21:14 +05:30
Alexander Ivash
82313f9464 update imports for utilities / all other qml files found 2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244 cherry-picking 2018-11-06 14:21:14 +05:30
Wayne Chen
2296848fcb Adding potential fix for showing audio stats - depends on PR#13401 2018-11-06 14:21:14 +05:30
Alexander Ivash
d0ac5128b0 repurpose qmlscratch into 'controls gallery' launcher 2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-11-06 14:21:14 +05:30