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

41478 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
ac5c055a1e don't verify simulated bit when adding to delete list 2016-03-24 21:12:22 -07:00
Andrew Meadows
d3d724530a minor optimiztion 2016-03-24 21:12:22 -07:00
Brad Davis
39ef5402bd Merge pull request #7471 from highfidelity/revert-7467-clean/drop-data 
Revert "Drop resource data after load"
 2016-03-24 20:50:06 -07:00
Brad Hefta-Gaub
cd5beabf10 Revert "Drop resource data after load" 2016-03-24 20:37:16 -07:00
Seth Alves
e0ab875ca8 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 19:43:30 -07:00
Zach Pomerantz
413c3b88cf Accept textures as list or json 2016-03-24 19:40:02 -07:00
Seth Alves
1b88284bf7 more threading cleanups 2016-03-24 19:14:25 -07:00
James B. Pollack
623cf1fb7a back to reality 2016-03-24 18:10:55 -07:00
Brad Hefta-Gaub
7de8a2267f one more try 2016-03-24 18:09:14 -07:00
Anthony J. Thibault
6a5a443eff Avatar: Eye-tracking works again 
This replaces the calculation of the Head left and right eye positions used for eye tracking.
Which was inadvertently removed in this commit 7483b8546b
 2016-03-24 18:07:46 -07:00
Atlante45
76c30d9014 Fix sometimes slow server-console logs. 2016-03-24 17:56:11 -07:00
Brad Hefta-Gaub
17a2ed7dd0 Merge pull request #7467 from zzmp/clean/drop-data 
Drop resource data after load
 2016-03-24 17:52:19 -07:00
ericrius1
327e937970 positioned posters and lamp 2016-03-24 17:51:24 -07:00
Brad Davis
0ac70049c7 Merge pull request #7431 from hyperlogic/tony/vive-rendering-work 
OpenVR rendering & Nsight instrumentation improvements
 2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
cfaa97d8f3 one more try 2016-03-24 17:39:23 -07:00
Brad Hefta-Gaub
fc41c5bca9 Merge pull request #7448 from Menithal/entity-properties-refresh-cache 
Added Refresh Buttons to entityProperties
 2016-03-24 17:34:46 -07:00
Brad Hefta-Gaub
6d76a5872f Merge pull request #7461 from hyperlogic/tony/avatar-culling-fix 
Avatar: fix for Avatar animation updates while wearing HMD
 2016-03-24 17:34:20 -07:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
Seth Alves
f8fe7b5868 add back getMesh call 2016-03-24 17:22:34 -07:00
Brad Hefta-Gaub
5b13ebf72b more mac build busters 2016-03-24 17:19:11 -07:00
James B. Pollack
d3e7e4c791 revert revert 2016-03-24 17:01:43 -07:00
James B. Pollack
542ad2ed62 test revert 2016-03-24 16:59:04 -07:00
James B. Pollack
fa9f988719 hifi 2016-03-24 16:53:36 -07:00
James B. Pollack
adc0637001 still trying 2016-03-24 16:52:58 -07:00
ericrius1
aa4817ea26 attaching trigger box to base of lamp in living room 2016-03-24 16:52:37 -07:00
James B. Pollack
6bed4d4e8e thangz 2016-03-24 16:50:49 -07:00
Brad Hefta-Gaub
06a6a8462f more cleanup 2016-03-24 16:34:09 -07:00
Brad Hefta-Gaub
2b595fb329 break out thread safe moving average to get around unix build hell 2016-03-24 16:26:28 -07:00
Brad Hefta-Gaub
299103fc4f Merge pull request #7466 from zzmp/clean/image-reader 
Clean image-reader to drop image sooner
 2016-03-24 16:24:47 -07:00
Howard Stearns
d580cb8694 Merge pull request #7464 from jherico/atomic_display_plugin 
Make display plugin switching atomic from other threads
 2016-03-24 16:16:56 -07:00
ericrius1
54e125871f adding bulldog lamp to desk in living room 2016-03-24 16:08:24 -07:00
James B. Pollack
1ad3e1ae98 list joints 2016-03-24 16:00:04 -07:00
James B. Pollack
74648b6a25 throttle 2016-03-24 15:58:23 -07:00
James B. Pollack
392a4c3313 testing 2016-03-24 15:54:03 -07:00
Zach Pomerantz
afc853572a Drop resource data after load 2016-03-24 15:50:51 -07:00
Zach Pomerantz
8d0e419a5c Clean image-reader to drop image sooner 2016-03-24 15:50:48 -07:00
Seth Alves
6abed67c05 cleanups 2016-03-24 15:46:30 -07:00
Brad Hefta-Gaub
8691aa6905 fix unix build and CR feedback 2016-03-24 15:45:44 -07:00
James B. Pollack
4f1fc296e6 werk 2016-03-24 15:31:32 -07:00
Seth Alves
7c910fcf5e further reworking of polyvox threading 2016-03-24 15:28:19 -07:00
James B. Pollack
aba8794428 freezer 2016-03-24 15:25:59 -07:00
James B. Pollack
8eb0f51f56 testing 2016-03-24 15:23:15 -07:00
Brad Davis
520cccb219 Make display plugin switching atomic from other threads 2016-03-24 15:19:46 -07:00
Zach Pomerantz
a34e6773a9 Add messageBox for no gl support 2016-03-24 15:13:38 -07:00
ericrius1
e916e6b937 dog lamp light works 2016-03-24 14:35:56 -07:00
James B. Pollack
b4a4f276ea logs etc 2016-03-24 14:33:58 -07:00
Brad Hefta-Gaub
deed643ca7 add additional tracking of max elapsed 2016-03-24 13:30:39 -07:00
Brad Hefta-Gaub
6eed8fb429 fix unix build 2016-03-24 13:30:20 -07:00
Ken Cooke
063891d65e remove dead code 2016-03-24 13:29:57 -07:00
James B. Pollack
5f3c176269 get avatar everytime 2016-03-24 13:23:44 -07:00