Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34783 commits 76 branches 59 tags 1.2 GiB
Commit graph

14753 commits

Author SHA1 Message Date
Howard Stearns
f1e0742aeb Add getTargetFrameRate(). 2015-11-23 10:20:59 -08:00
Howard Stearns
9673133bf4 whitespace (reduce diffs) 2015-11-20 14:26:37 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb final(?) cleanup 2015-11-20 13:51:12 -08:00
howard-stearns
a366598598 snapshot. It works. 2015-11-20 11:48:44 -08:00
Clément Brisset
f4b0492b33 Merge pull request #6436 from birarda/ghost-avatar 
fix for ghosted avatars thanks to check/add race
 2015-11-20 11:41:20 -08:00
Stephen Birarda
9b5bfd45bc change lock back to locker to remove change 2015-11-20 11:04:46 -08:00
Stephen Birarda
19d3d80ff9 fixes for some incorrect assumptions 2015-11-20 11:03:52 -08:00
Howard Stearns
b5e5adc41e Update for changed target frame period. 2015-11-20 09:51:57 -08:00
Howard Stearns
0f6a37f0f7 remainder->fmod! 2015-11-20 09:49:14 -08:00
Howard Stearns
431a8c9584 cleanup 2015-11-19 17:12:50 -08:00
Stephen Birarda
22f5d4df6d change signature of copy return 2015-11-19 16:25:33 -08:00
Stephen Birarda
430cb7876d remove a couple of read lockers for AvatarHashMap 2015-11-19 16:22:56 -08:00
Stephen Birarda
40397add43 fix for extra adds in AvatarManager 2015-11-19 16:15:21 -08:00
Stephen Birarda
6398a922c6 leverage COW for AvatarHash 2015-11-19 15:43:29 -08:00
Stephen Birarda
5140a480a1 fix for recursive write then read lock 2015-11-19 15:35:41 -08:00
Stephen Birarda
2a05ec650b fix locking in AvatarHashMap/AvatarManager 2015-11-19 14:17:48 -08:00
Howard Stearns
f6286201f4 cleanup 2015-11-19 11:55:22 -08:00
U-GAPOS\andrew
b7f501c0b3 use glm::quat_cast instead of extractRotation() 2015-11-19 10:42:53 -08:00
Howard Stearns
7d30cd0159 checkpoint: it works! 2015-11-19 09:18:40 -08:00
samcake
90ee205a66 Merge pull request #6429 from ZappoMan/samConditionalLove 
make preferences dialog resizable
 2015-11-18 18:07:07 -08:00
Brad Hefta-Gaub
dc093159a1 make preferences dialog resizable 2015-11-18 17:54:51 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00
howard-stearns
42a1ee353e checkpoint 2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4 Make recording and playback work in interface, playback in agent 2015-11-18 14:04:45 -08:00
Anthony Thibault
d3d3ddfaf1 Merge pull request #6417 from AndrewMeadows/avatar-capsule 
fix bounding capusule calculations for new avatars
 2015-11-18 13:02:48 -08:00
Brad Hefta-Gaub
35677d3a48 Merge pull request #6418 from birarda/test-ds-settings-fail 
move keepalive pings transparently to NL
 2015-11-18 11:12:16 -08:00
Stephen Birarda
c54dffac12 fix entity-server avg ping, remove debug 2015-11-18 10:32:35 -08:00
Andrew Meadows
ae88057ad9 remove dangling whitespace 2015-11-18 10:24:10 -08:00
Stephen Birarda
0e3d3451d7 make keep alive pings the responsibility of NL 2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab Merge pull request #6413 from samcake/controllers 
Recording: Moving the Recording js interface to the Script engine
 2015-11-18 10:22:55 -08:00
Andrew Meadows
ee751ed1b9 use kDop volume of avatar mesh parts for capsule 2015-11-18 09:22:40 -08:00
Howard Stearns
fee13d4375 Rebuild on a new branch after original stopped building. 2015-11-17 20:06:25 -08:00
Brad Hefta-Gaub
a1e10a9f04 Merge pull request #6309 from thoys/20724 
CR for Job #20724 - Camera entity mode
 2015-11-17 20:05:22 -08:00
Philip Rosedale
450608bf5b Merge pull request #6390 from sethalves/average-near-holds 
Average near holds
 2015-11-17 20:01:46 -08:00
samcake
368f19b4e2 Merging with todays upstream and checking 2015-11-17 18:58:10 -08:00
samcake
d2f3b48637 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-17 17:36:38 -08:00
Brad Davis
48b0465e56 Fixing race condition on seek, correcting some issues with frame timing 2015-11-17 15:18:32 -08:00
Brad Davis
900f425f35 Recording fixes 2015-11-17 15:18:31 -08:00
Andrew Meadows
2b07daa976 Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes 
Bug fixes for avatars with no eyes
 2015-11-17 14:29:20 -08:00
Brad Davis
6664d8d919 Merge pull request #6398 from ZappoMan/messaging 
messages-mixer
 2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838 Bug fixes for avatars with no eyes 
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.

Also, prevent array access with negative indices when eye bones are missing.

ಠ_ಠ
 2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
32bf81ef0d move MessagesClient to agent 2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
e7a8df306c fix warnings 2015-11-17 11:18:36 -08:00
Sam Gateau
5b92929833 Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client 2015-11-17 09:32:22 -08:00
samcake
8553033d59 Refactoring the mess for the Agent 2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub
1e0b66a68f more work 2015-11-16 19:23:39 -08:00
samcake
71cc36fdd8 removing ms to seconds conversion in MyAvatar 2015-11-16 18:31:24 -08:00
Brad Hefta-Gaub
12f206e2f0 more work on messages 2015-11-16 17:00:03 -08:00
Brad Davis
8a27a2fba5 Fixing recording interface times 2015-11-16 16:29:10 -08:00