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

11257 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -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
Stephen Birarda
0f859d3eae Merge pull request #2520 from birarda/master 
add missing commas to bot script
 2014-03-26 13:00:27 -07:00
Stephen Birarda
d61c5bb38b add two missing commas to bot script 2014-03-26 13:00:09 -07:00
Brad Hefta-Gaub
5ab7922dad Merge pull request #2519 from birarda/master 
cleanup sound loading in bot script
 2014-03-26 12:59:41 -07:00
Stephen Birarda
e9cbdbb904 cleanup sound loading in bot script 2014-03-26 12:57:10 -07:00
Andrzej Kapolka
c18d0ccf8f Formatting fixes. 2014-03-26 12:34:46 -07:00
Andrzej Kapolka
a9097658ad Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 12:27:34 -07:00
Andrzej Kapolka
c31b04af4c Fix for Windows initial device selection. 2014-03-26 12:23:08 -07:00
ZappoMan
7a3e19eb0f Merge branch 'master' of https://github.com/worklist/hifi into scaling_work 2014-03-26 12:18:08 -07:00
Philip Rosedale
b3b9a2f337 Merge pull request #2516 from birarda/master 
actually change NodeList send buffer size
 2014-03-26 12:12:26 -07:00
Stephen Birarda
6e161e7c61 actually attempt to change send buffer size 2014-03-26 12:05:55 -07:00
Philip Rosedale
020f4b020e Merge pull request #2503 from birarda/master 
increase NodeList send buffer size to 1MB
 2014-03-26 12:00:43 -07:00
ZappoMan
bc68ed1300 moved stopTrackingThread() to setIsShuttingDown() to reduce chance of object conflict 2014-03-26 11:59:55 -07:00
Stephen Birarda
962c7350f3 wait on broadcastThread before destroying AvatarMixer, closes #2499 2014-03-26 11:53:57 -07:00
Philip Rosedale
9d8089a7d1 Merge pull request #2514 from birarda/kill-node-button 
add a button on DS admin page to kill all nodes
 2014-03-26 11:50:02 -07:00