Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 71 branches 56 tags 1.2 GiB
Commit graph

41398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f0da39be22 replace the console icon with new icons 2016-03-25 11:40:13 -07:00
Seth Alves
13eddef312 fix locking in GenericQueueThread::process 2016-03-25 11:37:04 -07:00
Philip Rosedale
e891fd219b Merge pull request #7472 from AndrewMeadows/delete-mortal-entities 
expire mortal entities correctly
 2016-03-25 11:33:07 -07:00
Brad Hefta-Gaub
759fac228c fix the doppelganger 2016-03-25 11:29:14 -07:00
Andrew Meadows
7064b29a2d Merge pull request #7473 from jherico/revert_webchannel 
Revert "Build a better event bridge"
 2016-03-25 11:29:06 -07:00
Brad Hefta-Gaub
6c6131c7b3 fix the doppelganger 2016-03-25 11:22:54 -07:00
Zach Pomerantz
864def31ea Don't refresh NetworkGeometry with cache 2016-03-25 10:56:20 -07:00
Stephen Birarda
d8859def37 fix for AccountManagerAuth::Type register, consts 2016-03-25 10:47:06 -07:00
Brad Hefta-Gaub
984d6ae48f fix model resizing bug 2016-03-25 10:46:14 -07:00
Philip Rosedale
f000ef6158 Merge pull request #7469 from hyperlogic/tony/eye-tracking-fix 
Avatar: Eye-tracking works again
 2016-03-25 10:24:37 -07:00
Stephen Birarda
0043a84234 guard the SendQueue sleep and send a user activity when weird 2016-03-25 10:22:14 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Chris Collins
2a85170a46 Merge pull request #7470 from zzmp/fix/tex-json 
Accept textures as list or json
 2016-03-25 10:05:12 -07:00
Zach Pomerantz
aad40f5de0 Drop network data after processing 2016-03-25 09:58:34 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
samcake
093f5d0019 Merge pull request #7460 from hyperlogic/tony/skip-culling-render-config 
CullTask: added ability to disable culling during rendering.
 2016-03-25 09:40:35 -07:00
Philip Rosedale
5804559f91 Merge pull request #7468 from Atlante45/fix/console-log 
Fix sometimes slow server-console logs.
 2016-03-25 09:18:34 -07:00
Anthony J. Thibault
c00a412d3b Fix misleading comments for _skipCulling case. 2016-03-25 09:10:46 -07:00
Andrew Meadows
6c36d55fea Merge pull request #7459 from kencooke/master 
Fix Reverb Zone settings to work correctly with new reverb
 2016-03-25 08:17:45 -07:00
samcake
9fb1a9a2a8 Merge and many more counters 2016-03-25 03:02:18 -07:00
Seth Alves
ae6d6f4bb3 added comments, minor cleanups 2016-03-24 21:37:46 -07:00
Seth Alves
c57aa565df Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 21:37:25 -07:00
Brad Hefta-Gaub
fb09ad51b3 CR feedback 2016-03-24 21:14:07 -07:00
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
David Rowe
8185e13e18 Style checkboxes 2016-03-25 16:40:26 +13:00
Brad Hefta-Gaub
cd5beabf10 Revert "Drop resource data after load" 2016-03-24 20:37:16 -07:00
samcake
3f844d7a82 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-24 20:36:29 -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
Zach Pomerantz
c625d36bd8 Persist material transform/params 2016-03-24 19:28:44 -07:00
Seth Alves
1b88284bf7 more threading cleanups 2016-03-24 19:14:25 -07:00
Zach Pomerantz
eeeb175bb8 Derive NetworkMaterial, avoid copying it 2016-03-24 18:50:44 -07:00
Zach Pomerantz
3402635f99 Lock geometry on blender 2016-03-24 18:50:43 -07:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13: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
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
samcake
0c8556528b Polishing the PerfPlot qml to display usefull things 2016-03-24 17:25:58 -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
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