Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 14:36:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12704 commits 25 branches 0 tags 1.1 GiB
Commit graph

1355 commits

Author SHA1 Message Date
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -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
Andrew Meadows
ddc9408a55 commit implementation of deleteLastCollision() 2014-05-05 12:32:23 -07:00
Andrew Meadows
f6b2b43376 forget collision for this failure case 2014-05-05 12:31:36 -07:00
Andrew Meadows
d2f858100e add CollisionList::deleteLastCollision() 2014-05-05 12:30:38 -07:00
Andrew Meadows
0cecef6441 fix "nearly but not quite" edge/corner collisions 2014-05-05 10:01:31 -07:00
Andrew Meadows
b097eed1aa fix sphere-cube collisions at edges (really) 2014-05-05 08:47:02 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrew Meadows
0e3d66caf6 fix incorrect rescale of vec3 2014-05-02 22:27:52 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00
Andrew Meadows
9ceda573cc sphere-cube: add the penetration don't subtract it 2014-05-02 10:39:27 -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
4e34d0339d set position in ctor that takes endpoints 
and some cleanup
 2014-04-29 15:15:53 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Andrew Meadows
7464ca0879 non-rounded collision solution in comments 2014-04-23 08:38:58 -07:00
Andrew Meadows
1986ac6be3 collisions with cube get rounded normals at edges 2014-04-22 20:53:12 -07:00
Andrew Meadows
f3fd81ca59 use glm::modf() for less code 2014-04-22 14:26:52 -07:00
Atlante45
fea0a262a6 Put back missing windows header 2014-04-22 12:35:50 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Andrew Meadows
62121b1232 remove include of StreamUtils.h again 2014-04-22 11:46:15 -07:00
Andrew Meadows
65d3b4dc39 fix penetration direction for sphere-vs-AACube 2014-04-22 11:43:23 -07:00
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
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
be2db49e08 Last touch to removing gettimeofday 2014-04-21 16:44:21 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -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
Andrzej Kapolka
e2558bdac0 Experimenting with tweaking the Euler angles so that z, rather than y, is in 
[-pi/2, pi/2].
 2014-04-18 17:16:20 -07:00
Andrzej Kapolka
58b063ee12 Make sure we call allReferencesCleared on the right thread. 2014-04-17 11:13:22 -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
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -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
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
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00