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

11271 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f8ee8044ca Merge pull request #2562 from birarda/dojo-network 
NodeList hack for hacker dojo network
 2014-03-27 17:42:22 -07:00
Stephen Birarda
5c7ac6d3a1 hack the NodeList to take the socket on which pinged as active socket 2014-03-27 17:41:55 -07:00
Philip Rosedale
069008c03f Merge pull request #2557 from ZappoMan/bugfixes 
tweaks to _processLock to reduce time it's locked
 2014-03-27 15:09:48 -07:00
Philip Rosedale
a9d24451cf Merge pull request #2556 from ey6es/master 
Fix for shadows' showing up on the wrong side of objects.
 2014-03-27 15:08:45 -07:00
ZappoMan
c540427b9e tweaks to _processLock to reduce time it's locked 2014-03-27 15:03:46 -07:00
Andrzej Kapolka
077df3906f Make sure we reset our LOD adjustments before we switch back from throttling 
the renderer.
 2014-03-27 15:02:26 -07:00
Andrzej Kapolka
eab4b4bc5d Make sure we process the model root nodes in alphabetic order. 2014-03-27 14:47:46 -07:00
Andrzej Kapolka
9078d9a0f2 Fix for avatar LOD's getting into a degenerate state. Don't persist the 
avatar LOD, since we adjust it more rapidly.
 2014-03-27 14:14:31 -07:00
Andrzej Kapolka
ca4a4a692f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-27 13:58:19 -07:00
Stephen Birarda
0fc83d81fd Merge pull request #2555 from ZappoMan/backtotrylockanduuid 
added back use of nodeWithUUID() instead of sharedpointer
 2014-03-27 13:55:17 -07:00
Brad Hefta-Gaub
efcd07ffc4 Merge pull request #2550 from birarda/master 
fix for Agent interest list
 2014-03-27 13:51:04 -07:00
Andrzej Kapolka
563725e781 Use the "correct" shadow strategy: include only ambient term when in shadow. 2014-03-27 13:44:34 -07:00
ZappoMan
bda96ef935 added back use of nodeWithUUID() instead of sharedpointer 2014-03-27 13:35:22 -07:00
Andrzej Kapolka
7cc7230745 Adjust the shadow shader to prevent seeing shadows on the opposite sides of 
objects.  Closes #2544.
 2014-03-27 13:18:45 -07:00
Stephen Birarda
21eef6c15e make sure VoxelServer and ParticleServer are in Agent interest list 2014-03-27 13:10:03 -07:00
AndrewMeadows
8661bdf788 Merge pull request #2548 from ey6es/master 
Couple of quick fixes: reset the skeleton joints when space is pressed a...
 2014-03-27 11:21:24 -07:00
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a 
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
 2014-03-27 11:08:55 -07:00
Stephen Birarda
9dd2573311 Merge pull request #2545 from ZappoMan/bugfixes 
Fixes Voxel Server "stop sending" issue
 2014-03-27 09:04:25 -07:00
ZappoMan
9fdfa4a7a8 switch to using SharedNodePointer instead of UUID in octree server send thread 2014-03-27 02:33:32 -07:00
ZappoMan
55b9dd1aee remove non-locking version of nodeWithUUID() 2014-03-27 02:32:19 -07:00
ZappoMan
c6c4b58699 adds reset of octree element population statistics 2014-03-27 02:31:39 -07:00
Philip Rosedale
56492e3ac8 Merge pull request #2536 from ey6es/master 
Provide a simple means of tracking download progress, increase speed at which we adjust avatar LOD.
 2014-03-26 23:23:27 -07:00
Philip Rosedale
7d168b5b1f Merge pull request #2537 from ZappoMan/bugfixes 
some windows bug fixes
 2014-03-26 23:22:06 -07:00
Philip Rosedale
de0fea3e95 Merge pull request #2539 from birarda/flock-bots 
fix for audio-mixer not spatilizing on faceshift head yaw
 2014-03-26 23:20:39 -07:00
Andrzej Kapolka
f339a3c0d7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 18:30:23 -07:00
Stephen Birarda
206096465b Merge branch 'master' of https://github.com/highfidelity/hifi into flock-bots 2014-03-26 17:46:48 -07:00
Stephen Birarda
7eab276122 suppress debug in ScriptEngine, fix spatialization from FS head changes 2014-03-26 17:19:23 -07:00
Stephen Birarda
87cbe9a1f4 Merge pull request #2524 from AndrewMeadows/shapes 
avatar responds to hand-vs-head collisions again
 2014-03-26 17:10:43 -07:00
Brad Hefta-Gaub
0435b16668 fix formatting 2014-03-26 16:52:24 -07:00
ZappoMan
11c089c221 add support for getting the actual default audio devices in windows by name 2014-03-26 16:48:57 -07:00
Andrzej Kapolka
26da3bcefd Bump up the rate at which we increase detail. 2014-03-26 16:28:03 -07:00
Andrzej Kapolka
1bb7c6f3ed Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 16:14:28 -07:00
Andrzej Kapolka
1cae0dc94c Adjust avatar LOD faster. Closes #2496. 2014-03-26 16:01:07 -07:00
Andrzej Kapolka
52c8a865f1 Provide a means of tracking resource download progress. Until we have a 
user-friendly progress meter/throbber, put the download progress in the
extended stats.
 2014-03-26 15:53:19 -07:00
Brad Hefta-Gaub
411ebf805a use InvokeMethod() for all menu scripting operations 2014-03-26 15:42:53 -07:00
Brad Hefta-Gaub
2257afd390 removed unneeded call to disconnect() 2014-03-26 15:20:27 -07:00
AndrewMeadows
cec3f944d7 Merge pull request #2525 from ZappoMan/scaling_work 
Voxel/Particle Server Scaling Work
 2014-03-26 15:16:22 -07:00
Andrew Meadows
63c4af8950 remove cruft: Head::applyCollision() 2014-03-26 14:10:43 -07:00
Andrew Meadows
7a649084bd reduce the lean recovery timescale 2014-03-26 14:07:21 -07:00
ZappoMan
c56efb9e4c formatting tweaks 2014-03-26 13:41:49 -07:00
Brad Hefta-Gaub
d90ebfd29a Merge pull request #2504 from Atlante45/upload_feedback 
Display warning popup when something went wrong with the fst upload
 2014-03-26 13:31:49 -07:00
Brad Hefta-Gaub
ad93b71f24 Merge pull request #2522 from Atlante45/upload_fixes 
Fixed uninitialized member
 2014-03-26 13:30:53 -07:00
Brad Hefta-Gaub
0265ca516c Merge pull request #2523 from birarda/master 
fix for AudioMixer kill and re-add and no sound load in bot
 2014-03-26 13:30:37 -07:00
ZappoMan
0451ce455f added --statusHost config option to allow us to specify the host name of the status page 2014-03-26 13:25:38 -07:00
Andrew Meadows
9a4db152ff avatar responds to hand-vs-head collisions again 2014-03-26 13:20:18 -07:00
Stephen Birarda
676bcbe2cf Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 13:19:35 -07:00
Stephen Birarda
28f962ea2b fix for AudioMixer kill and re-add and no sound load in bot 2014-03-26 13:19:20 -07:00
ZappoMan
18eda50118 added thread counts to json stats 2014-03-26 13:13:55 -07:00
Atlante45
f95c43393c Fixed uninitialized member 2014-03-26 13:10:56 -07:00
Brad Hefta-Gaub
53bc51925d Merge pull request #2518 from ey6es/master 
Fix for default audio device on Windows (it wasn't fetchable by name, so pass along the info object).
 2014-03-26 13:04:51 -07:00