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

79998 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kalila R
28b27a1e48 Merge branch 'v0.83.0-rc' into kasen/core 2019-08-03 15:27:23 -04:00
Shannon Romano
a58efe744b
Merge pull request #16010 from MiladNazeri/v0.83.0-rc 
changed root to micBar which had the gated property
 2019-07-30 15:32:26 -07:00
milad
7d3ac62c86 changed root to micBar which had the gated property 2019-07-30 13:09:01 -07:00
Andrew Meadows
54dc66bd5f
Merge pull request #16006 from jherico/fix/bugz-964-rc83 
BUGZ-964: fix for incorrect color curve when rendering 3D into QML
 2019-07-30 12:06:20 -07:00
Brad Davis
36b249d4dc BUGZ-964: fix for incorrect color curve when rendering 3D into QML 2019-07-29 17:57:20 -07:00
Shannon Romano
f24158bf00
Merge pull request #15999 from howard-stearns/steam-store-commerce-83 
Steam store commerce 83
 2019-07-29 15:31:50 -07:00
Howard Stearns
77f9ac7209
Merge pull request #16000 from howard-stearns/avatar-verification-more-diagnostics-83 
Avatar verification more diagnostics 83
 2019-07-29 15:27:20 -07:00
Howard Stearns
adc155aa47 Merge branch 'avatar-verification-more-diagnostics' of https://github.com/SimonWalton-HiFi/hifi into avatar-verification-more-diagnostics-83 2019-07-29 12:09:31 -07:00
Howard Stearns
d5d53afe67 Merge branch 'steam-store-commerce' of https://github.com/howard-stearns/hifi into steam-store-commerce-83 2019-07-29 12:04:03 -07:00
Shannon Romano
75146a104d
Merge pull request #15982 from sabrina-shanman/bug_lod_too-low 
(BUGZ-1040) Fix LOD randomly being too low in simplified UI
 2019-07-29 09:45:19 -07:00
Simon Walton
d9572d9e8c Improved avatar-verify diagnostics 2019-07-26 15:35:09 -07:00
Sam Gateau
7486e906eb
Merge pull request #15983 from samcake/toulouse 
BUGZ-1080: Changing the default Intel GPU platform profile from mid to low
 2019-07-27 00:13:45 +02:00
Anthony Thibault
5375e53ecb
Merge pull request #15974 from luiscuenca/avatarSitAPI 
DEV-269: First Class Sitting API
 2019-07-26 13:36:00 -07:00
Ryan Huffman
2de26ff653
Merge pull request #15993 from luiscuenca/WLDisplayErrorWhenNotConnected 
BUGZ-815: WL Display error when connection fails
 2019-07-26 13:23:14 -07:00
Howard Stearns
6ef0821801 steam gets the oculus store commerce treatment 2019-07-26 12:44:48 -07:00
luiscuenca
c77da03535
Display error when connection fails 2019-07-26 12:01:33 -07:00
MiladNazeri
e6e771df7b
Merge pull request #15977 from MiladNazeri/permissionsUIFix 
[DEV-190] + [DEV-191] :: Permissions UI
 2019-07-26 11:25:18 -07:00
Zach Fox
1a81765d71
Merge pull request #15989 from MiladNazeri/nametagDisplayRenderingFix 
[BUGZ-1073] - Add extra padding to the nametag
 2019-07-26 10:22:37 -07:00
luiscuenca
c1b818cd9b
Set timeout before enabling drive keys 2019-07-25 17:40:09 -07:00
sabrina-shanman
601b579c42 Set the LOD angle in simplifiedUI to current effective default, to be adjusted later 2019-07-25 17:32:56 -07:00
sabrina-shanman
3da5896e22 Bring back lodQualityLevel 2019-07-25 17:16:14 -07:00
sabrina-shanman
94e725dc2a Fix rare case where script would fail to set LOD after disabling auto LOD 2019-07-25 17:15:28 -07:00
sabrina-shanman
4b5a45209e Prefer using LODManager.lodAngleDeg for setting manual LOD 2019-07-25 17:15:22 -07:00
Shannon Romano
4dc67b5c58
Merge pull request #15987 from danteruiz/launcher-zip 
DEV-317: Edit postbiuld.py to produce zip file for the Mac Launcher.
 2019-07-25 17:07:08 -07:00
milad
f87e306ad4 adding extra padding to the initial textbox calculation 2019-07-25 16:35:30 -07:00
Ryan Huffman
ef0977248d
Merge pull request #15986 from huffman/fix/create-not-working-patch 
Fix non-functional Create
 2019-07-25 16:17:43 -07:00
MiladNazeri
b0723599d8 Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:47:48 -07:00
MiladNazeri
b419be97be Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:47:24 -07:00
MiladNazeri
cf23b7a303 Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:47:17 -07:00
MiladNazeri
20b709b382 Update interface/resources/qml/controlsUit/PermissionPopup.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-07-25 15:46:10 -07:00
milad
5083e449b0 cr round 2 2019-07-25 15:42:25 -07:00
milad
2f4566b63c merged master and fixed height 2019-07-25 15:42:03 -07:00
milad
4c0d8b6fda improved layout to match the figment more 2019-07-25 15:42:02 -07:00
milad
993e5db2da changed rectangle to have anchor.fill 2019-07-25 15:42:02 -07:00
milad
2498bf2fd8 Cr changes r1 2019-07-25 15:42:02 -07:00
milad
9f0fc8bd06 removed logs and prototype code 2019-07-25 15:42:02 -07:00
milad
189809dc2c Fixed undefined error when displaying from the dictionary 2019-07-25 15:42:02 -07:00
milad
2b4dd327ec removed log statements 2019-07-25 15:42:01 -07:00
milad
b0bc4639be removed temp folder 2019-07-25 15:42:01 -07:00
milad
cd5df63f51 working version for all qml web files 2019-07-25 15:41:53 -07:00
dante ruiz
58dea69ecf create zip file for launcher 2019-07-25 15:41:34 -07:00
milad
fb7a66b110 working version with just flickable 2019-07-25 15:38:23 -07:00
milad
43268c0f65 Working QML window 2019-07-25 15:38:23 -07:00
milad
dec176b921 checking to see if I did something blocking the build 2019-07-25 15:38:22 -07:00
Ryan Huffman
9872c1c2f7 Add missing emit inside of 2019-07-25 13:55:44 -07:00
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial 
DEV-266: Add serverless tutorial
 2019-07-25 13:39:03 -07:00
Shannon Romano
c2186305b3
Merge pull request #15981 from luiscuenca/WLVersionAndUpdate 
DEV-243 | DEV-221: Display Window Launcher version number and autoupdate
 2019-07-25 13:28:21 -07:00
Howard Stearns
520ba59899
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown 
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
 2019-07-25 12:50:07 -07:00
Zach Fox
12a9837a4b
Merge pull request #15984 from zfox23/removeSomeEventBridgeCode 
BUGZ-969: Remove some audio-related code that hasn't worked in a while
 2019-07-25 12:41:43 -07:00
Zach Fox
6e33f3f23a BUGZ-969: Remove some audio-related code that hasn't worked in a while 2019-07-25 11:49:28 -07:00