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

43306 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
880b52aad2 update attachedEntitiesManager to work better with avatarEntities 2016-05-16 09:52:48 -07:00
Seth Alves
3876a8037c Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-16 09:51:20 -07:00
Brad Hefta-Gaub
1f800294c6 Merge pull request #7880 from jherico/gpu_smart_buffers 
Support partial CPU->GPU buffer transfers
 2016-05-14 17:44:26 -07:00
Brad Hefta-Gaub
1c20212c39 Merge pull request #7901 from jherico/fix_procedural 
Fix procedural rendering on primitives
 2016-05-14 17:31:08 -07:00
Brad Davis
1e136ed71f Fix procedural rendering on primitives 2016-05-14 10:59:59 -07:00
Brad Hefta-Gaub
87aa90de08 Merge pull request #7878 from howard-stearns/vive-buttons-out-of-pause 
More buttons to get out of away/pause.
 2016-05-14 09:12:16 -07:00
Brad Davis
e8bd97c761 Fix GPU buffer memory statistics 2016-05-14 08:28:51 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Brad Davis
eb84459f03 Support partial CPU->GPU buffer transfers 2016-05-14 08:28:50 -07:00
Brad Hefta-Gaub
a5f99ba370 Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer 
fix invisible default avatars
 2016-05-14 07:48:16 -07:00
Brad Hefta-Gaub
e754b9e19c Merge pull request #7871 from samcake/hdr 
Defaulting the color formats used in the rendering pipeline to sRGB
 2016-05-13 17:35:48 -07:00
Brad Hefta-Gaub
b1d86c8881 Merge pull request #7898 from samcake/red 
Fix broken rendering for simple metallic material
 2016-05-13 17:22:36 -07:00
Brad Hefta-Gaub
0d5fdbdb6e Merge pull request #7879 from howard-stearns/fix-reticle-offset 
fix reticle position offset
 2016-05-13 17:17:23 -07:00
Seth Alves
6277bf8603 if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer. 2016-05-13 16:37:43 -07:00
samcake
96dffad0d3 Fixing the metallic simple material rendering black from obj 2016-05-13 16:35:15 -07:00
samcake
cdb9cb6519 Fixing the metallic simple material rendering black from obj 2016-05-13 16:33:14 -07:00
Brad Hefta-Gaub
c443138dd2 Merge pull request #7869 from zzmp/fix/fbx-access 
Check vector access in fbx reader
 2016-05-13 15:29:24 -07:00
Brad Hefta-Gaub
987b3483a8 Merge pull request #7876 from sethalves/fix-grab-fixes 
fix grab-fixes
 2016-05-13 15:26:31 -07:00
Seth Alves
5247ca5c22 Merge pull request #7896 from ZappoMan/possibleFixToFUESnafu 
move firstRun.set() to correct place
 2016-05-13 14:15:58 -07:00
Seth Alves
bfac7c6f68 Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 13:33:39 -07:00
Seth Alves
ceb6aa582f don't crash when a moving model entity is deleted 2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d don't crash when a moving model entity is deleted 2016-05-13 13:32:00 -07:00
Brad Hefta-Gaub
65aae42714 move firstRun.set() to correct place 2016-05-13 13:28:02 -07:00
Seth Alves
efe02c0fa1 make lock/unlock button easier to see 2016-05-13 10:57:41 -07:00
Seth Alves
0ab987faac Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 10:13:10 -07:00
Seth Alves
09317f46e5 Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into update-model-meta 2016-05-13 09:52:59 -07:00
Seth Alves
81af0d0a47 Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 09:41:56 -07:00
Seth Alves
574709824e oops 2016-05-13 09:41:19 -07:00
Seth Alves
36e5751638 Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 07:12:39 -07:00
Seth Alves
9bd4b4f8d8 Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator 2016-05-13 07:12:11 -07:00
Seth Alves
dabecb7cc2 merge from other branch 2016-05-13 07:11:57 -07:00
Seth Alves
79141e3869 dry up some code 2016-05-13 07:06:25 -07:00
Seth Alves
eb19c5be13 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-13 07:04:58 -07:00
samcake
fa87c68ca7 INtroducing the TransformBuffer 2016-05-13 01:08:25 -07:00
Seth Alves
dd2a29aace when a ModelEntityItem moves, also update its meta-render-item 2016-05-12 18:05:28 -07:00
Seth Alves
30fb9349c4 dry up some code 2016-05-12 17:52:40 -07:00
howard-stearns
40f7212b1e Make uses of getReticlePosition consistent with respect to window offset. 2016-05-12 16:37:03 -07:00
howard-stearns
41dc9a23a8 More buttons to get out of away/pause. 2016-05-12 15:41:15 -07:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon 
Introduce the "Unlit" shading model support and apply it to Web Enitities
 2016-05-12 15:09:50 -07:00
samcake
670826effc appeasing linux gods ? 2016-05-12 14:50:41 -07:00
samcake
c6aeaf308b appeasing linux gods ? 2016-05-12 14:36:45 -07:00
samcake
a436c54817 make scribe spit out bigger chunks of litteral strings 2016-05-12 14:14:05 -07:00
James B. Pollack
e92b4029b2 Merge pull request #7866 from imgntn/firePit 
[Home] Updates to content
 2016-05-12 13:48:40 -07:00
Seth Alves
009c288745 revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out 2016-05-12 13:29:40 -07:00
Seth Alves
2f93a38a6a Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3 2016-05-12 11:17:18 -07:00
Seth Alves
63073301ee try again to fix update logic 2016-05-12 11:16:42 -07:00
Seth Alves
2101d7dea3 Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3 2016-05-11 18:50:01 -07:00
Seth Alves
ce3faa2916 fix logic in UpdateEntityOperator 2016-05-11 18:47:20 -07:00
Seth Alves
c784ca9771 debugging 2016-05-11 18:45:56 -07:00
Seth Alves
fcd2e45d67 merge from upstream 2016-05-11 18:45:32 -07:00