Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 00:49:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42480 commits 25 branches 0 tags 1.1 GiB
Commit graph

42480 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
7c7cd6e9e5 Go simple with a a true map for the unifrom mappings 2016-04-18 19:05:49 -07:00
samcake
4bbe0ddc6d Go simple with a a true map for the unifrom mappings 2016-04-18 19:01:15 -07:00
samcake
85fd1dcb5b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-18 18:25:16 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Brad Hefta-Gaub
a572ac31dc Merge pull request #7704 from samcake/lemon 
Exposing the CPU TIming of the Render Jobs to the JS API
 2016-04-18 18:12:14 -07:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
5ae1e70197 Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests 
Added avatar unit tests
 2016-04-18 18:03:29 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir 
Remove fix for old QT file path bug in OSX
 2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776 Merge pull request #7682 from zzmp/clean/stars 
Cleanup stars to persist a single BufferView
 2016-04-18 17:59:48 -07:00
Brad Hefta-Gaub
f5cddc9962 fix the bug that Omega found 2016-04-18 17:26:12 -07:00
samcake
c6deff16d6 Resoving to master... 2016-04-18 17:24:55 -07:00
samcake
d25a366962 Resoving to master... 2016-04-18 17:23:57 -07:00
samcake
7951284e9c Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-04-18 16:54:17 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
3298883774 Merge pull request #7702 from zzmp/fix/clear-octree-on-exit 
Clear entities and avatars on exit
 2016-04-18 15:48:35 -07:00
Seth Alves
70ddd8529b Merge pull request #7684 from zzmp/fix/runaway-loading-resources 
Fix ResourceCacheSharedItems::_loadingRequests removals
 2016-04-18 15:46:45 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing 
Manually generate mipmaps for textures while loading
 2016-04-18 15:09:12 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
Zach Pomerantz
146ea066db Update AvatarManager.cpp 2016-04-18 14:53:04 -07:00
Zach Pomerantz
c9dc642d76 Fix type in AvatarManager::clearAllAvatars 2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182 Fix typo in AvatarManager::clearAllAvatars 2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Seth Alves
65f51322fa Merge pull request #7700 from Atlante45/fix/cleanup-iodevice 
Cleanup disk cache io device
 2016-04-18 14:28:41 -07:00
Atlante45
c9fa91936a Cleanup disk cache io device 2016-04-18 14:10:51 -07:00
Seth Alves
4bf98a80b9 Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash 
fix entity-server crash when entity moves out of bounds
 2016-04-18 14:09:21 -07:00
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -07:00
Seth Alves
b943a664b6 Merge pull request #7691 from ctrlaltdavid/20886 
Fix QML warnings at shutdown
 2016-04-18 10:26:09 -07:00
Seth Alves
dea748d132 Merge pull request #7683 from zzmp/clean/texture 
Remove unused static method gpu::Texture
 2016-04-18 10:25:53 -07:00
Anthony J. Thibault
efb6a5c3f6 hifi-boot.js: Coding convention update 2016-04-18 09:49:09 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
3a969eed47 Manually generate image mip levels when loading textures 2016-04-17 10:22:24 -07:00
Brad Davis
0d3bf366c1 Support loading multiple mips in texture transfer 2016-04-17 10:22:24 -07:00
Brad Davis
ac3d6c77b9 Add default parameter to mip loaded notifications 2016-04-17 10:20:02 -07:00
Brad Davis
c35d81260d Load local texture files through the same code as network 2016-04-17 10:20:01 -07:00
Brad Davis
75c99fe416 Working on GPU library test code 2016-04-17 10:20:01 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
4b7a4e80ff Merge pull request #7675 from samcake/orange 
Fixing the Bump Map generating Normal Map path
 2016-04-17 10:00:45 -07:00
Brad Hefta-Gaub
b62f1a135d fix qml to work with rect instead of vec4 2016-04-16 17:29:03 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
d5a46d3390 handle repositioning of qml windows 2016-04-15 20:01:14 -07:00
samcake
554247193c Trying SSBO for the object matrices 2016-04-15 19:55:52 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Anthony J. Thibault
9ab3255285 updated avatarUnitTests.js 2016-04-15 18:07:07 -07:00
Zach Pomerantz
0d06d8ea93 Clear freed loading resources 2016-04-15 17:34:45 -07:00
Zach Pomerantz
d2426f30c6 Mv ResourceCacheShared to top of impl 2016-04-15 16:40:07 -07:00
Zach Pomerantz
f2b9acd84d Rm Texture::createFromStorage 2016-04-15 16:40:05 -07:00