Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46675 commits 75 branches 59 tags 1.2 GiB
Commit graph

46675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
23c3f794d9 Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-13 11:36:44 -07:00
Seth Alves
92bda6827b remove vive keyboard 2016-09-13 11:27:10 -07:00
Seth Alves
dff567054d qml keyboard for avatar preferences dialog 2016-09-13 11:17:00 -07:00
Marko Kudjerski
6ccf86e3e9 remove qtaudio_windows.dll on Windows before installing the new version 2016-09-13 11:10:36 -07:00
Brad Hefta-Gaub
7c3c05a450 Merge pull request #8584 from zzmp/fix/audio-starve-detection 
fix audio client starve detection
 2016-09-13 09:08:20 -07:00
Brad Hefta-Gaub
e828a18a2e Merge pull request #8532 from ctrlaltdavid/21040 
Add performance information to entities list
 2016-09-13 08:32:34 -07:00
Seth Alves
161424afaf qml keyboard for browsable preferences 2016-09-12 21:39:52 -07:00
David Rowe
fa0aeb4563 Display render info values only when valid provided 2016-09-13 13:03:47 +12:00
David Rowe
0cf3f6e953 Fix texture count and size getting stuck on 0 2016-09-13 13:03:06 +12:00
Seth Alves
d0e693247a Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-12 16:52:43 -07:00
Seth Alves
753e4c4c7b keyboard for avatar attachment model url dialog 2016-09-12 16:49:10 -07:00
Seth Alves
2c0676d9b1 make qml keyboard work better in running-scripts dialog 2016-09-12 16:28:24 -07:00
Seth Alves
b841e3094d qml keyboard for file dialog 2016-09-12 16:23:05 -07:00
David Rowe
d61e4c5c11 Display textures size in MB 2016-09-13 10:52:19 +12:00
Seth Alves
e1d00908ac Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-12 15:37:22 -07:00
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
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12: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
Seth Alves
51fe9b2a80 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-12 09:59:19 -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
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +12: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
David Rowe
a06f49f791 Fix footer entities count not being updated when change filter value 2016-09-10 11:14:23 +12:00
David Rowe
68499f49ad Fix count of textures 2016-09-10 10:15:13 +12: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
David Rowe
487cb7d893 Use findInFrustum in entities list and filter results per search radius 2016-09-09 18:58:38 +12:00
David Rowe
38c2efa22f Implement Entities.findInFrustum() method 2016-09-09 18:57:48 +12:00
David Rowe
ce58edc4e0 Add frustum property to JavaScript Camera object 2016-09-09 18:56:05 +12: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