Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 22:07:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46564 commits 76 branches 59 tags 1.2 GiB
Commit graph

46564 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
3e86b2f0f2 remove some unneeded objectNames 2016-09-12 15:34:29 -07:00
Seth Alves
4c370d0d32 qml keyboard for query-dialog 2016-09-12 15:31:07 -07:00
Seth Alves
38a1556716 qml keyboard for running-scripts window 2016-09-12 13:28:46 -07:00
Seth Alves
e020351c93 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-12 11:22:12 -07:00
Chris Collins
7eba6cdbed Merge pull request #8591 from howard-stearns/remove-jpg-error-popup-behavior 
remove jpg error popup behavior
 2016-09-12 09:55:46 -07:00
Howard Stearns
b949c83a05 remove jpg error popup behavior 2016-09-10 11:18:14 -07:00
Seth Alves
8899c0b790 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-10 10:43:07 -07:00
Seth Alves
44af3b43cc fix property access 2016-09-09 17:02:11 -07:00
Seth Alves
c396196e0f show and hide keyboard for qml windows 2016-09-09 16:48:46 -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
Seth Alves
dd39d46883 fold WebEntityAPIHelper members into OffscreenQmlSurface 2016-09-09 13:41:09 -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
Seth Alves
f6398315b1 avoid a crash-on-exit 2016-09-09 11:48:14 -07:00
Seth Alves
e5b56fec7c put keyboard on location dialog 2016-09-09 11:32:17 -07:00
Seth Alves
123ac541ea started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 11:31:48 -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
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
Seth Alves
25786f273d Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-09 10:16:09 -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
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
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
Seth Alves
4788485b60 Merge branch 'feature/tablet-ui-foundation' of github.com:hyperlogic/hifi into qml-keyboard 2016-09-08 10:42:33 -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
Anthony J. Thibault
ebb4c0990b Removed local copy of qtwebchannel.js, use qt resource version instead 2016-09-07 17:14:33 -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