Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 06:50:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11433 commits 71 branches 59 tags 1.2 GiB
Commit graph

11433 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
fff7a36b54 merge upstream/master into physics project 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
 2014-03-25 15:55:26 -07:00
Stephen Birarda
c8b3ae0c40 add a mutex to NodeData and leverage in AvatarMixer threads 2014-03-25 15:49:47 -07:00
Stephen Birarda
6f4f55038b add back selective inclusion of Avatars based on distance 2014-03-25 15:31:53 -07:00
Andrew Meadows
d90b325b1c Add penetration resolution helper for Hand class 2014-03-25 15:31:46 -07:00
Andrew Meadows
06fbd49ffa Adding StreamUtils for common debug output 2014-03-25 15:29:22 -07:00
Andrew Meadows
5934a17475 fix sphere-capsule collisions at the capsule caps 2014-03-25 15:27:28 -07:00
Philip Rosedale
746630b378 Merge pull request #2497 from birarda/avatar-debug 
separate broadcast method to sep thread in AvatarMixer
 2014-03-25 15:18:28 -07:00
Stephen Birarda
6b8c60e964 remove waitForBytesWritten for initial tests 2014-03-25 15:10:53 -07:00
Stephen Birarda
292fb51b43 use performance throttling instead of distance to decide when to send 2014-03-25 15:05:17 -07:00
Stephen Birarda
d5be3f1c9f output socket errors if they occur 2014-03-25 15:01:24 -07:00
Stephen Birarda
56869a769d remove some extraneous domain-server check in debugging 2014-03-25 14:53:32 -07:00
Stephen Birarda
38ad75fc9e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-debug 2014-03-25 14:52:28 -07:00
Stephen Birarda
46f8e2493b Merge pull request #2495 from birarda/random-number 
remove loadRandomIdentifier and random number generator seed no longer required
 2014-03-25 14:46:02 -07:00
Stephen Birarda
f0f3cf7282 remove seed to random number generator that is no longer needed 2014-03-25 14:36:02 -07:00
Philip Rosedale
ec2254056c Merge branch 'master' of https://github.com/worklist/hifi 2014-03-25 14:35:03 -07:00
Stephen Birarda
7190ce9a88 remove loadRandomIdentifier for STUN requests, use UUID 2014-03-25 14:33:53 -07:00
Philip Rosedale
e6e10f7b77 Merge pull request #2493 from birarda/master 
seed random number generator in ScriptEngine
 2014-03-25 14:30:31 -07:00
Stephen Birarda
41e2ce2b19 remove DS check in debug 2014-03-25 14:29:59 -07:00
Stephen Birarda
f8c479f9c5 seed random number generator in ScriptEngine for Math.random use in JS 2014-03-25 14:28:26 -07:00
Philip Rosedale
61bfc77c06 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-25 14:23:27 -07:00
Philip Rosedale
affd499188 Merge pull request #2494 from ZappoMan/bugfixes 
Bugfixes
 2014-03-25 14:23:05 -07:00
Andrzej Kapolka
249e9f0e33 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-25 14:19:38 -07:00
Philip Rosedale
3051104054 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-25 14:10:47 -07:00
Stephen Birarda
269615bc40 thread broadcast of avatar data in AvatarMixer 2014-03-25 14:02:24 -07:00
Stephen Birarda
0407c6d324 use QTimer to clock broadcastAvatarData method 2014-03-25 13:50:22 -07:00
Stephen Birarda
4e77afb4b2 block and wait for bytes to be written during broadcastAvatarData loop 2014-03-25 13:38:02 -07:00
Stephen Birarda
68d55152b9 flush after each call to writeDatagram 2014-03-25 13:28:53 -07:00
Stephen Birarda
08bfc15b70 output more descriptive socket error 2014-03-25 13:20:45 -07:00
Stephen Birarda
6a8637230f add socket error debugging 2014-03-25 13:17:37 -07:00
Stephen Birarda
ce169dd87d add code return debug to DS check in packet 2014-03-25 13:06:44 -07:00
Stephen Birarda
08ed708ee6 add domain IP and packet size debugging 2014-03-25 13:05:58 -07:00
Stephen Birarda
f0b87bebc2 cleanup debug and inactive node pinging 2014-03-25 13:02:09 -07:00
ZappoMan
9a3533a38f added inspect.js to defaultScripts.js 2014-03-25 12:59:57 -07:00
ZappoMan
4df277829b Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-03-25 12:56:16 -07:00
ZappoMan
a256473ac5 fixed lookWithTouch.js to not reset 2014-03-25 12:55:50 -07:00
Stephen Birarda
4ebffe4650 Merge pull request #2492 from birarda/master 
output count of unreplied ds check ins for root avatar-mixer debug
 2014-03-25 12:30:33 -07:00
Stephen Birarda
bc1b7045cb output count of unreplied domain-server check ins 2014-03-25 12:30:06 -07:00
Stephen Birarda
05c1415194 Merge pull request #2491 from birarda/master 
suppress sleep time debug in AvatarMixer
 2014-03-25 12:18:47 -07:00
Stephen Birarda
9d6dac6a76 suppress sleep time debug in favour of stats in AvatarMixer 2014-03-25 12:18:28 -07:00
Stephen Birarda
a35eca1d4b Merge pull request #2490 from birarda/master 
properly increment framesSinceCutoffEvent in mixers
 2014-03-25 12:17:29 -07:00
Stephen Birarda
1fe01f3e61 increment framesSinceCutoffEvent in mixers to enable recovery 2014-03-25 12:16:07 -07:00
Stephen Birarda
b5ea3df82a Merge pull request #2489 from birarda/avatar-scaling 
cleanup of stats styling
 2014-03-25 11:52:10 -07:00
Philip Rosedale
70a26ff895 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-25 11:51:20 -07:00
Stephen Birarda
49fd413722 fix for stats styling 2014-03-25 11:50:25 -07:00
Philip Rosedale
925f8241e5 adding joint animation 2014-03-25 11:48:46 -07:00
Philip Rosedale
ec3a83820e Merge pull request #2488 from birarda/avatar-scaling 
avatar-mixer tuning for identity and billboard packets
 2014-03-25 11:46:25 -07:00
Stephen Birarda
ff788a340b add stat for average billboard and identity packets per frame 2014-03-25 11:38:00 -07:00
Stephen Birarda
8a796be785 only fade avatars if they have ever been initialized 2014-03-25 11:10:28 -07:00
Stephen Birarda
786d9ce404 force sending of identity and billboard packets changed in last frame 2014-03-25 10:56:06 -07:00
Andrzej Kapolka
a5dd5ebe0b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-25 10:52:03 -07:00