Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 08:07:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72743 commits 69 branches 56 tags 1.2 GiB
Commit graph

6862 commits

Author SHA1 Message Date
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 
hide progress overlays if interstitial mode
 2018-10-19 16:35:42 -07:00
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix 
More reliable "Create Entities as Grabbable" settings persistence.
 2018-10-18 18:26:48 -07:00
John Conklin II
bbccd0ff73
Merge pull request #14120 from zfox23/MS18609_snapShareBugs 
Fix MS18609: Various Snapshot sharing bugs
 2018-10-18 18:21:23 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full 
go to error-room when failing to connect to a full domain
 2018-10-18 17:49:35 -07:00
John Conklin II
addae51976
Merge pull request #14215 from ctrlaltdavid/M19308 
Hide mini tablet immediately upon near grabbing an entity
 2018-10-18 17:47:17 -07:00
Wayne Chen
6cf9608c97 adding fade in and fade outt in interstitial for progress 2018-10-18 13:12:04 -07:00
David Rowe
490c085eb8 Merge branch 'master' into M16440 
# Conflicts:
#	scripts/system/controllers/controllerModules/hudOverlayPointer.js
#	scripts/system/controllers/controllerModules/inVREditMode.js
 2018-10-19 09:06:33 +13:00
Zach Fox
72b3777953 Merge branch 'master' of github.com:highfidelity/hifi into MS18609_snapShareBugs 2018-10-18 09:39:34 -07:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
Thijs Wenker
4ef2ad041b
Merge pull request #14136 from thoys/feat/create/exportSelection 
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
 2018-10-17 19:50:37 +02:00
David Rowe
c9919ff69d Hide mini tablet immediately upon near grabbing an entity 2018-10-16 08:22:30 +13:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
Howard Stearns
a92aa1f9da new treatment for hmd/tablet login 2018-10-12 14:17:23 -07:00
Seth Alves
47d3c9ba27 go to error-room when failing to connect to a full domain 2018-10-12 11:28:54 -07:00
David Rowe
0b163ffaf8 Fix typos 2018-10-09 11:05:48 +13:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged 
fix for failing to enter domain
 2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
Sam Gateau
46a50b04ea
Merge pull request #14034 from samcake/black-bis 
Refactor Deformed mesh rendering pipeline for better scalability and performances at runtime
 2018-10-04 20:41:28 -07:00
Wayne Chen
89e2cf7153
Merge pull request #7 from danteruiz/interstitialMerged 
Interstitial merged
 2018-10-04 17:10:27 -07:00
Wayne Chen
a2237aa48a reverting click overlay behavior 2018-10-04 16:41:14 -07:00
Wayne Chen
c423305bd1 check overlay visibility before showing back up again 2018-10-04 16:30:48 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
Wayne Chen
2e3566bc73 hide overlays after clicking on them 2018-10-04 14:24:43 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
22a9030fb5 hiding text overlays when out of error state 2018-10-03 17:54:55 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
David Rowe
3bc1c2963d Fix HUD laser while in Shapes app 2018-10-04 13:15:33 +13:00
David Rowe
209d1535c2 Fix HUD laser while in Create app 2018-10-04 10:42:17 +13:00
Sam Gateau
c194e795ac Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 12:12:15 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
Thijs Wenker
66c533b557 move export selection button to bottom of the list 2018-10-03 19:35:03 +02:00
Wayne Chen
efeb598495 fixing bug with hover overlay 2018-10-03 10:12:07 -07:00
John Conklin II
9a614d7523
Merge pull request #13977 from dback2/newEntityListView 
New optimized entity list view
 2018-10-03 09:23:11 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
sam gateau
680f5f5703 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-02 15:25:19 -07:00
David Rowe
2bdd8bfdc7 Update play area and sensor overlay models and raise a little 2018-10-03 11:09:04 +13:00
David Rowe
488599dbb0 Update teleport play area FBX model to be visible from below 2018-10-03 09:31:11 +13:00
David Rowe
c0231057f8 Revert foot calc scaling change 2018-10-03 09:28:19 +13:00
John Conklin II
2cd9e565b0
Merge pull request #14101 from dback2/editHandlePickPlaneImprovements 
Edit handle pick plane improvements
 2018-10-02 10:42:46 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
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
David Rowe
84a06fbe64 Don't immediately hide occlusion highlights after teleporting 2018-10-02 16:11:01 +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
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00