Andrew Meadows
e120697a9b
merge upstream/master into andrew/ragdoll
2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Andrew Meadows
4270c4d989
merge upstream/master into andrew/ragdoll
2014-09-03 14:42:17 -07:00
Andrew Meadows
2c1aa31d1e
give MyAvatar a VoxelShapeManager member
2014-09-03 13:19:41 -07:00
MarcelEdward
9662dced09
This patch updates the MyAvatar.cpp file.
...
It adds a check MyAvatar::goToLocationFromResponse to see if the user is online, if the teleport to the avatar is done and if not a message is shown which said that the user is not online
2014-09-03 16:59:00 +02:00
Andrew Meadows
aeb355e3da
re-enabling legacy avatar-vs-voxel collisions
...
so that I don't break anything when this merges with upstream
2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7
merge upstream/master into andrew/ragdoll
2014-08-29 15:48:40 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Stephen Birarda
cc2a35c2a8
handle not found errors returned for addresses from data-web
2014-08-28 10:54:05 -07:00
Andrew Meadows
c6253bb51a
AACube vs Sphere and Capsule collision tests
...
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
Atlante45
9e686b4096
Moved lean and head rotation inside Player class
2014-08-26 14:36:46 -07:00
ZappoMan
ef8feec91a
fix referentials corruption and removed some debugging
2014-08-26 10:42:46 -07:00
Atlante45
cf14af0766
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-08-25 18:54:41 -07:00
Andrzej Kapolka
e29a4e7683
Merge pull request #3312 from AndrewMeadows/ragdoll
...
use dispatchTable for shape-vs-shape collision queries
2014-08-25 15:43:48 -07:00
ZappoMan
d6873f7b6c
added some debugging for referentials
2014-08-25 14:48:08 -07:00
Andrew Meadows
3ebd8c1969
use dispatchTable for shape-vs-shape collisions
2014-08-21 16:40:25 -07:00
Atlante45
a9d3355f2e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-08-21 15:34:08 -07:00
Atlante45
f207abdd98
Move Player over to AvatarData for ACs to use
2014-08-21 15:24:19 -07:00
Atlante45
8760329323
Remove deprecated Audio class Player member
2014-08-21 11:08:37 -07:00
Clément Brisset
6a6670a962
Merge pull request #3307 from AndrewMeadows/inertia
...
JS scripts can set spine rotation
2014-08-21 11:07:39 -07:00
Atlante45
022109a249
Added timestamps to the scripted UI
2014-08-20 19:36:56 -07:00
Andrew Meadows
7e4c72445e
JS scripts set joint animation priorities
2014-08-20 17:14:59 -07:00
Atlante45
4922592cfa
Debug tweaks
2014-08-20 15:21:33 -07:00
Atlante45
72c60ee69c
Remove used variable
2014-08-19 19:01:50 -07:00
Atlante45
b028b845f4
Fox audio recording not being triggerred from JS
2014-08-19 17:22:05 -07:00
Atlante45
b13604f968
JS API for recording
2014-08-19 16:43:26 -07:00
Atlante45
6d567e67a9
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-18 15:41:19 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
Atlante45
1d30b52ec2
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-18 14:23:40 -07:00
Atlante45
52640c8482
Various tweaks and code cleanup
2014-08-18 14:23:29 -07:00
Andrew Meadows
aa1a7307cc
use Ragdoll::_accumulatedMovement to move MyAvatar
2014-08-18 12:53:34 -07:00
Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -07:00
Atlante45
2981132395
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-14 11:39:44 -07:00
Atlante45
db5aeddc0f
fix for joints not playing back
2014-08-14 10:58:00 -07:00
Andrew Meadows
7852321152
merge upstream/master into andrew/ragdoll
2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5
less variability in verlet simulation loop count
2014-08-13 14:51:16 -07:00
Atlante45
73a3a13c59
More recording work
2014-08-12 18:15:48 -07:00
Atlante45
792f779bbf
Hooked up MyAvatar to playbacks
2014-08-12 16:16:01 -07:00
Stephen Birarda
75aedae300
integration of positional tracking with DK2
2014-08-12 14:12:13 -07:00
Andrew Meadows
2918feddf0
reduce acceptable error for ragdoll simulation
2014-08-11 14:51:42 -07:00
ZappoMan
b7767b7971
get referentials compiling with new Entity ID changes
2014-08-08 15:12:57 -07:00
Andrew Meadows
bcb0cb2c3c
fix bug: variable should be float rather than int
2014-08-08 08:26:25 -07:00
Andrew Meadows
bb33266635
merge upstream/master into andrew/ragdoll
2014-08-07 14:37:10 -07:00
Andrew Meadows
0f784a9cc5
add other ragdolls to simulation
2014-08-07 13:09:05 -07:00
Andrew Meadows
db1d6c8b49
MyAvatar's ragdoll is the main simulation ragdoll
2014-08-07 09:23:05 -07:00
Andrew Meadows
cb8c0792b2
make main ragdoll and entity special
...
also addded some logic (unused) to add ragdolls of other avatars
2014-08-06 10:43:56 -07:00
Atlante45
b360b6c55d
PR cleanup + JS API
2014-08-05 17:07:03 -07:00
Atlante45
39a74cbc28
Few modifications to how avatars update their positions
2014-08-05 12:03:53 -07:00
Atlante45
d9dde06c14
Various tweaks to referentials
2014-08-04 14:59:15 -07:00
Atlante45
c65dc3fb1e
Various tweaks to ModelReferentials
2014-07-31 11:55:28 -07:00
