Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 21:01:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72789 commits 72 branches 59 tags 1.2 GiB
Commit graph

72789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
d1d4920c35 Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport 2018-10-01 21:35:18 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
Roxanne Skelly
34a7aff2ef Differentiate name of Console.app/Sandbox.app depending on client_only 
build
 2018-10-01 20:12:00 -07:00
David Rowe
84a06fbe64 Don't immediately hide occlusion highlights after teleporting 2018-10-02 16:11:01 +13:00
David Rowe
2f3a9412f3 Make highlight occlusion match overlay occlusion 2018-10-02 15:36:18 +13:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
Anthony Thibault
b62ca2b75c Better configuration, i.e. which puck is associated with which limb. 
Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
 2018-10-01 18:43:19 -07:00
NissimHadar
f863fabe68 Fix for create MD file. 2018-10-01 18:10:32 -07:00
sam gateau
392e2ff535 trying and failing andad trying and rince and repeat 2018-10-01 17:45:16 -07:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
0ef407a45c
Merge pull request #14116 from sethalves/fix-bad-render-downcasts 
get asan to not complain about invalid downcasts during transaction.updateItem
 2018-10-01 16:57:03 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147 
Do not have active buy button on invalidated items
 2018-10-01 16:50:53 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465 
Fix case 18465: redirect to domain after login
 2018-10-01 16:48:27 -07:00
Brad Hefta-Gaub
e5d9c0d442
Merge pull request #14083 from sethalves/fix-recording-upload-crash 
call saveRecordingToAsset callback on correct thread
 2018-10-01 16:46:36 -07:00
Brad Hefta-Gaub
d8959367c6
Merge pull request #14104 from birarda/bug/zone-ordering 
fix for row re-ordering causing no change alone
 2018-10-01 16:45:50 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix 
Fix avatar warp into floor when navigating to a saved bookmark
 2018-10-01 16:36:31 -07:00
David Back
b5edf42fd0
Merge branch 'master' into editHandlePickPlaneImprovements 2018-10-01 16:36:30 -07:00
Gabriel Calero
1422c178a4 Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-01 20:36:27 -03:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1 
Fix some Mac rendering issues
 2018-10-01 16:35:57 -07:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build 
get interface building and working with clang-7 on ubuntu 18
 2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061 
use current wearable index, not joint index!
 2018-10-01 16:14:33 -07:00
Brad Hefta-Gaub
526d69f1b8
Merge pull request #14020 from wayne-chen/fixMainTextContainerQML 
Login Dialog UI improvements
 2018-10-01 16:13:59 -07:00
Brad Hefta-Gaub
a3310be3fe
Merge pull request #14013 from gcalero/fix_android_login 
Fix android login infinite loading (case 18459)
 2018-10-01 16:13:29 -07:00
Brad Hefta-Gaub
6eae178389
Merge pull request #13997 from gcalero/case_18057 
Fix switch from Top View to My View
 2018-10-01 16:13:07 -07:00
Wayne Chen
36dbcd41ba Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged 2018-10-01 16:11:40 -07:00
Wayne Chen
69b547a9fe text overlays for consistency 2018-10-01 16:11:27 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2 updating interstitialmode 2018-10-01 15:26:56 -07:00
SamGondelman
1ec481922c don't render particles without textures 2018-10-01 14:54:34 -07:00
David Rowe
87ff6dd56d Fix play area sizing and positioning for different base avatar sizes 2018-10-02 10:53:31 +13:00
Roxanne Skelly
010e2091fa Fixup CPack install items for OSX to hopefully properly handle 
OSX .app directories
 2018-10-01 14:35:47 -07:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
SamGondelman
49553e0285 bake default skybox 2018-10-01 14:05:15 -07:00
Dante Ruiz
652ec2210d fixing loading issues 2018-10-01 13:58:14 -07:00
Roxanne Skelly
c370e064d9 Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTrayOsx 2018-10-01 13:36:14 -07:00
NissimHadar
b0dee3a802 Use correct URL for "serverless" 2018-10-01 13:09:15 -07:00
NissimHadar
39d55a6612 Use correct URL for "serverless" 2018-10-01 13:08:44 -07:00
luiscuenca
f3c89dd9d7 Same mutex 2018-10-01 13:08:14 -07:00
luiscuenca
c1aa5e9308 Add mutex to setter 2018-10-01 12:54:47 -07:00
Roxanne Skelly
fbaac4254e Set build targets properly for client-only install of console 2018-10-01 12:45:56 -07:00
Zach Fox
0081f9aac0 Also fix MS18512 2018-10-01 12:24:47 -07:00
Zach Fox
58f098577d Fix MS18609: Various Snapshot sharing bugs 2018-10-01 12:09:49 -07:00
sam gateau
c12115bfda Addressing the 4.1 pass and make sure it works on windows pc and mac 2018-10-01 11:51:46 -07:00