Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 12:11:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46674 commits 73 branches 59 tags 1.2 GiB
Commit graph

134 commits

Author SHA1 Message Date
Seth Alves
2468b56079 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-20 13:28:20 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Seth Alves
c396196e0f show and hide keyboard for qml windows 2016-09-09 16:48:46 -07:00
Seth Alves
dd39d46883 fold WebEntityAPIHelper members into OffscreenQmlSurface 2016-09-09 13:41:09 -07:00
Seth Alves
02dba2fe49 started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 11:23:37 -07:00
Seth Alves
ef8c2a2888 started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 10:46:54 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Brad Hefta-Gaub
418495d2c5 Merge pull request #8546 from samcake/yellow 
Revert the sRGB pixel format by default
 2016-09-03 10:16:16 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
442f6207fb Added raiseAndLowerKeyboard detector, streamlined EventBridge for web entities. 2016-09-02 11:17:08 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
samcake
b18c0d5325 Revert enabling sRGB for GLcontext pixel format 2016-08-30 12:44:35 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Davis
e4334be0cf Use synchronous logging (may impact performance when debugging is enabled) 2016-08-26 19:08:15 -07:00
Brad Davis
1652965ac2 Destroy contexts properly 2016-08-26 19:07:44 -07:00
Anthony J. Thibault
df17913801 Mipmap generation, trilinear,anisotropic filtering for OffscreenQmlSurface 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
6b46b3082c try, try again 2016-08-18 11:45:03 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Bradley Austin Davis
c303e1118a Only setup the debug logger once 2016-08-12 22:28:52 -07:00
Brad Davis
479b9a9f2b Cleanup GL helpers and debug logging 2016-08-12 22:28:39 -07:00
Brad Davis
2340afc48e Updating object transform code 2016-08-12 22:28:25 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Zander Otavka
51fb52977e Generalize atp handling in network access managers 2016-08-09 11:46:08 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Brad Davis
cbbb2a7975 Properly delete GL context and offscreen surfaces 2016-07-18 19:47:23 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Brad Davis
6242816f68 Adding glow to hand lasers 2016-07-12 10:10:01 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub
abcd1e0062 Merge pull request #8164 from SamGondelman/macHMDPreview 
Added Mac preview image if VSync is enabled
 2016-07-07 09:01:40 -07:00
samcake
b37df393e2 Merging with the new GL45Backend 2016-06-29 10:40:28 -07:00
Brad Davis
ab7fed1af8 Switch back to disable GL 4.5 by default, add support for logging when enabled 2016-06-28 18:56:25 -07:00
SamGondelman
12b5cccfc7 merge from master 2016-06-28 14:05:43 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -07:00
SamGondelman
0bfe3ea817 added support for disabling vsync on macs, but doesn't work with the rift 2016-06-27 11:34:44 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00