Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-19 03:11:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14578 commits 76 branches 59 tags 1.2 GiB
Commit graph

533 commits

Author SHA1 Message Date
barnold1953
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
Atlante45
30644c750d Switched AvatarData to NetworkAccessManager 2014-07-01 17:46:23 -07:00
Andrew Meadows
ca77eb9d1e cleanup of avatar collisions, prep for more ragdoll collisions 
removal of paddle hands
particles use general sphere collision path against avatars
temp removal of skeleton self collision
 2014-06-06 10:51:22 -07:00
Philip Rosedale
d17eeaf35b remove old oculus yaw offset, expand limit on head yaw 2014-05-29 16:50:13 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
 2014-05-14 09:38:31 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00
Andrew Meadows
607094075c Revert "Merge pull request #2834 from andrew/thermonuclear" 
This reverts commit e088c3d115, reversing
changes made to d124c0319d.
 2014-05-13 10:38:56 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear 
remove leap fingers
 2014-05-13 08:04:40 -07:00
Andrzej Kapolka
8541df9c32 Remember attachment parameters per joint (as well as the last joint used) so 
that the gun script correctly allows both guns' positions to be tweaked.
 2014-05-12 12:16:30 -07:00
Andrew Meadows
e983be4013 fix typo (finger length = 0.3m, not 0.03m) 2014-05-12 11:52:16 -07:00
Andrew Meadows
cea472b730 remove the last of Leap specific cruft 2014-05-12 11:48:56 -07:00
Andrew Meadows
efb3edf400 Store sixense data in meters not millimeters 2014-05-12 11:39:21 -07:00
Andrew Meadows
49dedb72c9 remove FingerData class and related cleanup 2014-05-12 11:09:12 -07:00
Andrzej Kapolka
c424f6ce69 Save attachment data for attachment model/skeleton model combinations, let 
scripts use those saved parameters so that you can tweak the location of
(for example) the gun and have it saved appropriately.
 2014-05-08 18:00:41 -07:00
Andrzej Kapolka
c02b708ee5 Provide the option to avoid making duplicate attachments. 2014-05-08 15:54:30 -07:00
Andrzej Kapolka
f866828db2 Avatar attachment scripting bits. 2014-05-08 15:20:14 -07:00
Andrew Meadows
6c289b682d move #include <StreamUtils.h> to cpp file 2014-05-07 11:18:50 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Andrzej Kapolka
0021c77789 Missed a spot for decoding avatar identity data. 2014-05-05 16:29:11 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrzej Kapolka
65e34f9697 More work on attachment interface. 2014-05-05 13:41:50 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrew Meadows
d8cb84080c stop avatar integration when standing at rest 2014-05-02 10:43:10 -07:00
Andrzej Kapolka
5e1f18635f Need to initialize this to an invalid URL, too. 2014-05-01 18:05:01 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
Andrew Meadows
8d4dca31c5 add velocity model for controlling avatar motion 2014-05-01 12:05:34 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Stephen Birarda
1a895b9342 add property for display name to JS 2014-04-18 14:24:50 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Stephen Birarda
47d4ef0b2d add a method to determine if avatar with display name exists 2014-04-17 17:44:41 -07:00
Stephen Birarda
e75d14139f fix avatar kill behaviour 2014-04-17 17:21:38 -07:00
Stephen Birarda
3e4369f2ff kill avatars in hash map after a timeout threshold 2014-04-17 16:57:00 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
16bb28a4fa make GnuTLS a system include to suppress warnings 2014-04-10 10:04:02 -07:00
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -07:00