Commit graph

46593 commits

Author SHA1 Message Date
samcake
e8c2dc10f1 best state for now 2016-09-13 14:59:23 -07:00
samcake
e9bf19840c minor fixes on mac 2016-09-13 08:58:07 -07:00
samcake
efc4406b47 Debugging the grid content 2016-09-12 19:46:18 -07:00
samcake
821072bb76 REarrange the light stage construction and light frame usage to produce the light clusters 2016-09-12 11:07:55 -07:00
samcake
7a7a60a5c4 INtroducing a true stage for updating the light cluster and ui to debug 2016-09-11 00:17:34 -07:00
samcake
3bcea4310d Fixing the vizualisation shader for world to cluster space 2016-09-10 10:41:18 -07:00
samcake
a0d09e3316 Fixing the vizualisation shader for world to cluster space 2016-09-10 10:14:31 -07:00
samcake
108910052a Adding the reverse transformation 2016-09-09 19:00:54 -07:00
Brad Hefta-Gaub
258c83f864 Merge pull request #8551 from jherico/texture_load_test_pbo
Stuttering: Sparse Textures
2016-09-09 13:47:27 -07:00
Brad Hefta-Gaub
dbf29ba79d Merge pull request #8569 from jherico/gli
Stuttering: Upgrade GLM & add GLI integration
2016-09-09 12:11:08 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
fddbeb6d11 Merge pull request #8588 from zzmp/test/audio-jitter
add a test for audio jitter in DEV/PR builds
2016-09-09 10:17:34 -07:00
Brad Davis
017181f020 Remove magic numbers, ensure proper buffer size for page transfers 2016-09-09 09:46:54 -07:00
Brad Davis
27ddd39a22 PR comments 2016-09-09 09:30:38 -07:00
Brad Davis
a13450b36f Fix ubuntu warning 2016-09-08 22:25:04 -07:00
Brad Davis
bc6b43b7be Add debug option to lower texture resolution 2016-09-08 22:19:17 -07:00
Brad Davis
e03b0b5825 Cleanup dead code 2016-09-08 22:19:16 -07:00
Brad Davis
a9ba92f16c Fix alignment of small pages 2016-09-08 22:19:15 -07:00
Brad Davis
f18b8f80fe Sparse texture transfers
Conflicts:
	libraries/gpu-gl/src/gpu/gl/GLTextureTransfer.cpp
2016-09-08 22:19:15 -07:00
Brad Hefta-Gaub
ad8a832c86 Merge pull request #8582 from howard-stearns/open-browser-and-close
Handle window.open/close in Web content.
2016-09-08 21:17:40 -07:00
Brad Hefta-Gaub
85cf7e8fe1 Merge pull request #8580 from jherico/scale_resolution_fix
Fix overlays when scaling resolution
2016-09-08 20:57:52 -07:00
samcake
9bcaca0577 Developping the Light Clusters, adding visualization 2016-09-08 19:12:11 -07:00
Brad Hefta-Gaub
b56ad737d4 Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Anthony J. Thibault
d38625ce2a Coding standard fix for JS portions of QML.
Semicolons at end of line.
2016-09-08 18:16:32 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port
Add settings to change local port
2016-09-08 18:10:32 -07:00
Brad Hefta-Gaub
8e14770d56 Merge pull request #8581 from howard-stearns/fix-system-toolbar
fix system toolbar following upgrade to QT 5.6
2016-09-08 18:10:12 -07:00
samcake
fa27376bd0 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-08 18:03:03 -07:00
samcake
61de063b29 Developping the Light Clusters, adding visualization 2016-09-08 18:02:35 -07:00
Anthony J. Thibault
3574267382 Fix for keyboard on facebook share pop-up
It was a div tag with "contenteditable"="true" attribute.
2016-09-08 18:00:45 -07:00
Zach Pomerantz
e785c0cdf8 add test for audio jitter 2016-09-08 17:50:11 -07:00
Zach Pomerantz
7b8f616099 add audiostream (jitter) logging 2016-09-08 17:23:56 -07:00
Atlante45
006780fe8e Indentation 2016-09-08 14:29:43 -07:00
Clément Brisset
4437b1b5d6 Merge pull request #8573 from Atlante45/master
Fix toolBar.js relative path
2016-09-08 14:22:18 -07:00
Anthony J. Thibault
f7516c2b07 code convention and eslint on createGlobalEventBridge.js 2016-09-08 13:52:19 -07:00
howard-stearns
ebf280fd6f Handle window.open requests from web pages in WebView following QT upgrade.
Handle window.close requests in the browser.
2016-09-08 13:06:33 -07:00
Anthony J. Thibault
594640f8b4 coding standard fixes 2016-09-08 11:53:23 -07:00
howard-stearns
b918e1ec51 fix system toolbar following upgrade to QT 5.6 2016-09-08 11:32:12 -07:00
Brad Davis
dbedb896f8 Fix overlays when scaling resolution 2016-09-08 11:21:43 -07:00
Brad Hefta-Gaub
a40a9f1d73 Merge pull request #8575 from kencooke/neon_optimization
Added ARM NEON optimized audio sample rate conversion
2016-09-08 09:58:47 -07:00
sam
25616be7c1 introducing the light Clusters 2016-09-08 02:16:13 -07:00
sam
a4df8a84b7 introducing the light Clusters 2016-09-08 00:11:54 -07:00
samcake
6a08c74463 Several experimetations without success 2016-09-07 18:39:07 -07:00
Anthony J. Thibault
ebb4c0990b Removed local copy of qtwebchannel.js, use qt resource version instead 2016-09-07 17:14:33 -07:00
samcake
139ba1b71c REnaming the shaders correctly 2016-09-07 14:56:01 -07:00
Anthony J. Thibault
69bda0de83 Shift key resets after first alpha key. 2016-09-07 13:49:47 -07:00
Anthony J. Thibault
7b4b98971e Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 12:49:13 -07:00
Anthony J. Thibault
9f0550ea7e Raised dpi of WebTablet to fit 480 width keyboard 2016-09-07 10:59:54 -07:00
Anthony J. Thibault
41e0b8732f fix for occasional crash when deleting web entity 2016-09-07 10:59:16 -07:00
samcake
5bc5c24889 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-07 10:00:16 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00