Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44920 commits 2 branches 0 tags 1.1 GiB
Commit graph

96 commits

Author SHA1 Message Date
Brad Davis
6242816f68 Adding glow to hand lasers 2016-07-12 10:10:01 -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
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
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
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
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
Atlante45
eb21b9c5d7 OSX warnings 2016-05-02 17:18:57 -07:00
Brad Hefta-Gaub
d88185eb6c Merge pull request #7703 from zzmp/fix/gl-qml 
Set GL in QML immediately
 2016-04-19 11:11:27 -07:00
Zach Pomerantz
62c252e8ef Set GL in QML immediately 2016-04-18 14:23:23 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70 Move gl info queries to GLHelpers 2016-04-11 13:28:18 -07:00
Brad Hefta-Gaub
b758acb7d8 Merge pull request #7610 from zzmp/fix/standard-qt-gl 
Codify qt qml version in one header
 2016-04-11 09:45:21 -07:00
Brad Davis
7827c0f6f6 Suppress key release events for presses that were absorbed by QML 2016-04-08 17:09:11 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Zach Pomerantz
be489e8728 Codify qt qml version in one header 2016-04-07 17:35:31 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Zach Pomerantz
530cb40528 Check for valid qml gl context creation 2016-03-30 15:11:54 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Zach Pomerantz
1405daa4ee Add guards when checking vsync 2016-03-25 14:18:12 -07:00
Zach Pomerantz
a34e6773a9 Add messageBox for no gl support 2016-03-24 15:13:38 -07:00
Brad Davis
84dc15aff6 Fix potential deadlock in QML 2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub
08b87b9b98 Merge pull request #7434 from zzmp/clean/incomplete-fbo 
Clean up QML Render Thread
 2016-03-23 10:43:21 -07:00
Zach Pomerantz
40b21933a5 Clean QML Surface render log 2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4 Lock the QML Surface resizing better 2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c Only set the context once per QML surface 2016-03-22 18:40:58 -07:00
Zach Pomerantz
745438148a Reset deadlock watch before qml load 2016-03-22 17:17:36 -07:00
Zach Pomerantz
e28a876629 Compare gl to GL_NO_ERROR, not GLEW_OK 2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135 Revert most of "Rm extra GL logging" 2016-03-22 13:24:29 -07:00
Zach Pomerantz
362e288be8 Rm mystery GL error before qml fbo 2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3 Rm extra GL logging 2016-03-22 12:04:58 -07:00
Zach Pomerantz
cc83a9bc36 Actually loop qml render and wake on pause 2016-03-21 14:36:45 -07:00
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Zach Pomerantz
41fcf4cc6d Forward declare qml render thread 2016-03-21 11:18:18 -07:00
Zach Pomerantz
62e635a52a Compile qml render thread on *nix 2016-03-18 18:43:59 -07:00