Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 09:54:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41783 commits 71 branches 56 tags 1.2 GiB
Commit graph

41783 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
619a724eb8 junk and shelf stuff 2016-04-01 11:49:30 -07:00
James B. Pollack
1302ea80d4 reset 2016-04-01 10:53:55 -07:00
James B. Pollack
d2105248ff try enabling blu chair 2016-04-01 10:49:39 -07:00
James B. Pollack
f9026fae66 various asans fixes 2016-04-01 09:35:19 -07:00
James B. Pollack
30c8a44411 Merge remote-tracking branch 'upstream/master' into homereset 2016-04-01 08:02:19 -07:00
Brad Hefta-Gaub
1e7a69fb90 Merge pull request #7523 from zzmp/fix/tex-load-fixup 
Render alpha textures immediately
 2016-03-31 21:04:04 -07:00
Brad Hefta-Gaub
7f041ec18e Merge pull request #7529 from jherico/texture_stress_test 
Add texture stress test
 2016-03-31 21:01:39 -07:00
Brad Hefta-Gaub
16f249ce6c Merge pull request #7524 from jherico/oculus_audio 
Allow display plugins to expose a preferred audio device
 2016-03-31 19:09:46 -07:00
Brad Davis
ef7febfcaf Merge pull request #7533 from zzmp/fix/model-release-texs 
Release textures from cache
 2016-03-31 18:58:01 -07:00
James B. Pollack
f891babd67 transformers 2016-03-31 18:21:57 -07:00
James B. Pollack
6bb78fbecf Merge pull request #16 from ericrius1/atpHomeReset 
added portkeys to poster and adjusted clock chime time
 2016-03-31 17:42:21 -07:00
ericrius1
39f5ed443a fixed merge conflicts 2016-03-31 17:16:36 -07:00
Zach Pomerantz
809b489146 Don't cache 0-sized Resources 2016-03-31 17:15:20 -07:00
Clément Brisset
588a5da3ca Merge pull request #7525 from sethalves/fix-load-from-disk 
Fix load from disk
 2016-03-31 17:04:33 -07:00
Zach Pomerantz
33d56d974e Set texture size in cache post-proc 2016-03-31 17:02:40 -07:00
Zach Pomerantz
b80f0fc8a6 Add actual byte size to Resource 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
James B. Pollack
c87dae69b0 remove plant for now 2016-03-31 16:59:48 -07:00
Clément Brisset
dc1d3a8ff5 Merge pull request #7527 from zzmp/fix/model-cache-delay 
Fix model fetch delay
 2016-03-31 16:59:27 -07:00
ericrius1
9ff4540697 growing plant fixes 2016-03-31 16:45:12 -07:00
ericrius1
724d403fc7 behavior as expected 2016-03-31 16:08:06 -07:00
ericrius1
50e1a11f6c change flower name 2016-03-31 15:16:57 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
ericrius1
aead16da89 growing flowers faster 2016-03-31 15:10:43 -07:00
ericrius1
4cf5f41eed changed chair path 2016-03-31 14:03:05 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Zach Pomerantz
bc2901aa96 Fix model fetch delay 2016-03-31 12:54:23 -07:00
Seth Alves
aea06914b4 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 11:45:48 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983 Use default texs for empty json 2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3 Rearrange model entity render to reduce flicker 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Brad Davis
b53968fd64 Add automatic switching the Oculus headphones and mic when activating the plugin 2016-03-31 10:33:11 -07:00
Andrew Meadows
74633ca8c8 Merge pull request #7522 from ZappoMan/optimizeFindZones 
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
 2016-03-31 10:14:32 -07:00
Seth Alves
cfa847ba54 don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts 2016-03-31 09:45:28 -07:00
Seth Alves
8299041997 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 09:44:56 -07:00
Brad Hefta-Gaub
2e129a398f add example script for testing 2016-03-31 09:37:03 -07:00
Brad Hefta-Gaub
03f9a2b46f more optimization in find best zone 2016-03-31 09:36:51 -07:00
James B. Pollack
1524c8324f revert 2016-03-31 09:24:31 -07:00
James B. Pollack
140bb75542 lots 2016-03-31 09:21:08 -07:00
James B. Pollack
e4f1320c50 disc lights 2016-03-31 08:42:05 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash 
Fix crash from updating/resetting avatar
 2016-03-30 21:31:17 -07:00
Seth Alves
ae971c0f30 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-30 20:58:44 -07:00
ericrius1
665597214a made desk lamp dimensions bigger 2016-03-30 20:04:33 -07:00
James B. Pollack
fa3ecc93a6 siwthcessss 2016-03-30 20:03:31 -07:00
James B. Pollack
3ee41404f7 switch emits 2016-03-30 19:55:41 -07:00
Brad Hefta-Gaub
30cb62f1aa Merge pull request #7517 from zzmp/fix/qml-renderer 
Check for valid qml gl context creation
 2016-03-30 19:52:03 -07:00
James B. Pollack
cf8d4aa993 chair 2016-03-30 19:48:54 -07:00
Brad Hefta-Gaub
b76f8509aa Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones 2016-03-30 19:29:28 -07:00