Andrew Meadows
7537d240bb
toward working avatar-vs-voxel collisions again
2014-04-22 10:48:42 -07:00
Andrew Meadows
a45bc6c110
remove const from CollisionList subscript operator
2014-04-22 10:48:05 -07:00
Andrew Meadows
63c02f2b04
add subscript operator for CollisionList
2014-04-21 18:22:34 -07:00
Andrew Meadows
1782e803c9
remove include StreamUtils.h
2014-04-21 18:21:39 -07:00
Andrew Meadows
8d6fa8f904
fix sphere-vs-axis-aligned-cube logic
2014-04-21 18:19:59 -07:00
Andrew Meadows
06784aa960
move AABox back to octree lib
...
Fleshing out ShapeCollider::collideShapeWithAACube()
2014-04-21 14:07:40 -07:00
Andrew Meadows
241df7a767
Move AABox from octree lib to shared lib
...
Stubbed out Shape vs Octree collisions
2014-04-21 10:27:20 -07:00
Andrew Meadows
54153a70a3
merge upstream/master into andrew/inertia
2014-04-18 11:30:26 -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
75f35c5858
optionally add an AvatarHashMap instance to the ScriptEngine
2014-04-17 17:55:16 -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
15d4f59ceb
Moved AnimationObject to separate source files.
2014-04-17 15:52:32 -07:00
Andrzej Kapolka
197127fbde
Added ability to read FBX textures embedded in FBX files.
2014-04-17 15:42:23 -07:00
Andrzej Kapolka
6251b6b819
Merge fix.
2014-04-17 13:55:16 -07:00
Andrzej Kapolka
58b063ee12
Make sure we call allReferencesCleared on the right thread.
2014-04-17 11:13:22 -07:00
Andrzej Kapolka
197ce036c4
Remove debugging line.
2014-04-17 11:06:28 -07:00
Andrzej Kapolka
21fa833f19
Merge branch 'master' of https://github.com/highfidelity/hifi into animate
...
Conflicts:
interface/src/Application.cpp
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
2014-04-17 10:58:34 -07:00
Andrzej Kapolka
0f69bbe23f
More work on animation loading.
2014-04-16 20:39:55 -07:00
ZappoMan
836913f1f0
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-16 15:21:15 -07:00
Stephen Birarda
49e7842d25
push packet version to force an update
2014-04-16 13:37:41 -07:00
Stephen Birarda
505145f693
add a missing bracket to IP_DONTFRAG
2014-04-16 12:02:02 -07:00
Stephen Birarda
afcb542bbe
fix a debug line in LimitedNodeList
2014-04-16 11:28:34 -07:00
Stephen Birarda
06a976041b
take pointer of optValue and not actual optValue
2014-04-16 11:27:30 -07:00
Stephen Birarda
a25ef58247
move DTLS socket changes to LimitedNodeList
2014-04-16 11:25:35 -07:00
Stephen Birarda
57567becc8
fix unexpected null parameter to disconnect, closes, #2663
2014-04-16 11:02:08 -07:00
Stephen Birarda
97e45e8fe5
re-instate connect behavior in DS so killed nodes re-connect, amend #2675
2014-04-16 10:56:33 -07:00
ZappoMan
bdf39186de
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-15 21:04:15 -07:00
Andrzej Kapolka
8cbad1bf54
More work on animation loading.
2014-04-15 19:37:28 -07:00
ZappoMan
579710e4bd
some cleanup
2014-04-15 13:36:20 -07:00
ZappoMan
60c6b27ab2
cleanup code a bit, add support for diffusions even with no ray intersection
2014-04-15 11:38:11 -07:00
Stojce Slavkovski
1a3e6595c5
Allow users to set the destination of Snapshots
2014-04-15 19:36:02 +02:00
Andrzej Kapolka
38c0e99cbe
More work on animation loading.
2014-04-14 18:12:32 -07:00
Andrzej Kapolka
a2dc58f7f9
Moved FBX code to its own library so that we can use it for bots.
2014-04-14 17:15:58 -07:00
Stephen Birarda
5904d19603
Merge pull request #2637 from birarda/authentication
...
add optional DTLS option for domain-server to node communication
2014-04-14 10:24:17 -07:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5
move isNaN() to shared utils
2014-04-13 19:09:07 -07:00
Andrew Meadows
508d4f216d
fix #2656 avatar jumps very far away
...
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule. The
penetration against such a shape could be arbitrarily large.
2014-04-11 15:55:18 -07:00
Stephen Birarda
1cd5fec71c
push packet version for assignments
2014-04-11 11:42:33 -07:00
Stephen Birarda
6431d35f86
add a missing newline to DomainHandler
2014-04-11 10:19:31 -07:00
Andrzej Kapolka
806bcc8e6f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 18:49:52 -07:00
Clément Brisset
5f6dee6c64
Merge pull request #2635 from thoys/windows-script-path-fix
...
Fixed loading local stored scripts on Windows machines
2014-04-10 16:40:47 -07:00
Stephen Birarda
86b0b78692
add a missing semi-colon for windows build
2014-04-10 12:27:52 -07:00
Stephen Birarda
9912c4c9a7
just call free instead of gnutls_free on windows
2014-04-10 12:24:41 -07:00
Stephen Birarda
38867a2f09
fix for re-declarations of xgnutls_free
2014-04-10 12:14:37 -07:00
Stephen Birarda
97444eac1c
put gnutls_free fix in DTLSSession header
2014-04-10 12:11:41 -07:00