Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 04:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73179 commits 25 branches 0 tags 1.1 GiB
Commit graph

7623 commits

Author SHA1 Message Date
Wayne Chen
c28ed9fc4b enabling certain menus/key events in login 2018-11-01 13:38:27 -07:00
Wayne Chen
6822287d67 sending to tutorial if dismiss login 2018-10-31 16:13:01 -07:00
Wayne Chen
f62c8ae87a overlay HMD implementation 2018-10-31 15:26:49 -07:00
Wayne Chen
67539bc87a Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-31 09:00:37 -07:00
Wayne Chen
03c39eb92f more wip 2018-10-31 07:45:55 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988 
Fix Interface eating memory when minimized
 2018-10-29 12:52:10 -07:00
Wayne Chen
ed847203ea wip for getting hmd overlay 2018-10-29 11:33:28 -07:00
Wayne Chen
6e0b89f0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-29 08:48:02 -07:00
Wayne Chen
11dc82a5cf Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-29 08:47:25 -07:00
Wayne Chen
c4aabfda44 adding prototype functions 2018-10-29 08:47:09 -07:00
Wayne Chen
af04630642 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-26 17:53:13 -07:00
David Rowe
1cca975b37 Fix Interface eating memory when minimized 2018-10-27 11:40:02 +13:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
Wayne Chen
955b0a580e adding hooks for application for pause/resume 2018-10-25 17:25:44 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Wayne Chen
331b09c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-24 09:16:24 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Wayne Chen
d7a4531d00 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-22 09:27:23 -07:00
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
Wayne Chen
3bd10716b2 wip 2018-10-19 16:06:28 -07:00
Wayne Chen
e32460ed96 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-19 09:25:57 -07:00
Anthony Thibault
3e68a1d5a5 Merge branch 'master' into feature/acceleration-limit-filter 2018-10-18 16:51:57 -07:00
Wayne Chen
5a381fdc03 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-18 14:53:49 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
David Rowe
c41ce5d484 Make tablet have priority over drawInFront overlays rendered behind it 2018-10-18 17:10:48 +13:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation 
Fix various ResourceCache bugs
 2018-10-17 11:13:35 -07:00
Wayne Chen
28a950fe9f staging 2018-10-15 16:51:28 -07:00
Anthony Thibault
640ed6a32a Added "Developer > Avatar > Show Tracked Objects" menu 2018-10-15 12:42:07 -07:00
Anthony Thibault
a3a87ef48b Debug rendering of tracked objects, remove filters from body. 2018-10-10 17:52:26 -07:00
Wayne Chen
60bbcc7fc3 adding initialization of qml when keyboard ready 2018-10-09 15:20:16 -07:00
Wayne Chen
ccebf3edef omitting keyboard focus hack 2018-10-08 17:18:40 -07: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
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
danteruiz
d285080197 remmoving some debug statements 2018-10-04 18:38:25 -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
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -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
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -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
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -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