Stephen Birarda
|
107cbc3f87
|
more simplification of hifi macros to find libraries
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
31488e72fe
|
repairs for interface build to succeed
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
0378fb3049
|
break glm helpers out of SharedUtil
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
892e30c5e1
|
get past assignment-client build after cmake auditing
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
2bb37f2d64
|
more Qt module dependencies sorted out for libraries
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
1059e9a635
|
add back more required Qt modules
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
b5c8a4d2c6
|
fix requirement of networking in audio library
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
fa26957b23
|
more CMakeLists cleanup for sub-dependencies
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
33e5826842
|
remove animation server, bubble up qt modules
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
9a50532b1f
|
bubble up sub dependencies to link_hifi_library
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
45afce48f7
|
remember old session UUID in AvatarHashMap to work around ghosting
|
2014-08-08 13:14:03 -07:00 |
|
ZappoMan
|
d50a607bc7
|
started support for new entity base class properties like velocity, gravity, damping, and lifetime
|
2014-08-08 11:38:03 -07:00 |
|
Andrzej Kapolka
|
b7b1b018ee
|
No need to use a texture for the cursor; we can just use a fragment shader.
|
2014-08-08 11:24:57 -07:00 |
|
Andrew Meadows
|
2286eae64a
|
head connects to neck during ragdoll simulation
|
2014-08-08 10:53:38 -07:00 |
|
ZappoMan
|
a8188b39d7
|
improve performance of handleAddEntityResponse() to use map and not recurse tree
|
2014-08-08 09:44:12 -07:00 |
|
Brad Hefta-Gaub
|
e882e08579
|
Merge pull request #3265 from AndrewMeadows/ragdoll
fix for extraneous joints in avatar ragdoll
|
2014-08-08 09:00:35 -07:00 |
|
Andrew Meadows
|
2fe22a4c1a
|
merge upstream/master into andrew/ragdoll
|
2014-08-08 08:43:02 -07:00 |
|
Andrew Meadows
|
05318acc7f
|
don't make shapes for joints with zero radius
|
2014-08-08 08:37:28 -07:00 |
|
Brad Hefta-Gaub
|
0f5ee4eac1
|
Merge pull request #3264 from AndrewMeadows/ragdoll
fix for bad models and some crashes
|
2014-08-08 08:36:10 -07:00 |
|
Andrew Meadows
|
bcb0cb2c3c
|
fix bug: variable should be float rather than int
|
2014-08-08 08:26:25 -07:00 |
|
Andrew Meadows
|
5de762361a
|
remove cleanup of Model::_jointStates tree
the cleanup causes crashes and broken models
|
2014-08-08 08:20:42 -07:00 |
|
Philip Rosedale
|
96a795eea4
|
Merge pull request #3263 from AndrewMeadows/ragdoll
Ragdoll Part 9:
|
2014-08-07 22:12:31 -07:00 |
|
Andrzej Kapolka
|
6930174a9e
|
Hide the cursor when the mouse pointer is hidden.
|
2014-08-07 18:30:33 -07:00 |
|
Andrzej Kapolka
|
0fc34a47aa
|
Show heightfield cursor.
|
2014-08-07 18:19:58 -07:00 |
|
Andrew Meadows
|
9a55252587
|
remove extraneous roots from Model::_jointStates
|
2014-08-07 17:02:28 -07:00 |
|
ZappoMan
|
6f479a1026
|
convert IDs to UUIDs
|
2014-08-07 17:02:11 -07:00 |
|
Leonardo Murillo
|
03985a3bd4
|
Merge pull request #3262 from ZappoMan/master
remove animation server
|
2014-08-07 16:14:30 -06:00 |
|
ZappoMan
|
84f3ede32f
|
small change to force rebuild
|
2014-08-07 15:09:24 -07:00 |
|
Andrzej Kapolka
|
4e1886dfcb
|
Divided when I should have multiplied.
|
2014-08-07 15:04:55 -07:00 |
|
ZappoMan
|
64699a213a
|
remove animation server
|
2014-08-07 14:48:51 -07:00 |
|
ZappoMan
|
2a65de8026
|
todo
|
2014-08-07 14:48:17 -07:00 |
|
ZappoMan
|
8c2dad1476
|
remove animation server
|
2014-08-07 14:40:06 -07:00 |
|
ZappoMan
|
37a6064cec
|
todo
|
2014-08-07 14:39:17 -07:00 |
|
Andrzej Kapolka
|
8de2dd9485
|
Working on ray intersection testing.
|
2014-08-07 14:38:47 -07:00 |
|
Andrew Meadows
|
bb33266635
|
merge upstream/master into andrew/ragdoll
|
2014-08-07 14:37:10 -07:00 |
|
Andrew Meadows
|
94da63006c
|
VerletPoint::_mass is now private
We set the mass of other avatars artificially high
so they are less movable.
|
2014-08-07 14:35:32 -07:00 |
|
ZappoMan
|
cd4ea4b34f
|
more animation work
|
2014-08-07 13:13:37 -07:00 |
|
Andrew Meadows
|
0f784a9cc5
|
add other ragdolls to simulation
|
2014-08-07 13:09:05 -07:00 |
|
ZappoMan
|
f1d2017a9e
|
getting animation working again
|
2014-08-07 12:50:02 -07:00 |
|
Andrew Meadows
|
87350ad2d0
|
ragdoll simulation now in model-relative frame
(same rotation as world-frame, but translated to MyAvatar origin)
|
2014-08-07 11:45:06 -07:00 |
|
Andrzej Kapolka
|
5a1456712f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-07 11:35:41 -07:00 |
|
ZappoMan
|
d1589e0d8e
|
removed addOrUpdateEntity() replaced with more efficient approach
|
2014-08-07 10:10:44 -07:00 |
|
ZappoMan
|
99d44ce945
|
make factories an array instead of map
|
2014-08-07 09:24:43 -07:00 |
|
Andrew Meadows
|
db1d6c8b49
|
MyAvatar's ragdoll is the main simulation ragdoll
|
2014-08-07 09:23:05 -07:00 |
|
Andrew Meadows
|
27b876e84c
|
namechange _frame --> _frameCount
|
2014-08-07 09:02:31 -07:00 |
|
Leonardo Murillo
|
8cca925679
|
Merge pull request #3260 from murillodigital/master
Fixing bug with visage find_library
|
2014-08-07 09:59:37 -06:00 |
|
Leonardo Murillo
|
6191db3a7f
|
Fixing bug with visage find_library
|
2014-08-07 09:59:07 -06:00 |
|
Andrzej Kapolka
|
acb973d245
|
Working on ray intersection testing.
|
2014-08-06 19:41:25 -07:00 |
|
Andrzej Kapolka
|
62e6493456
|
Started on heightfield brush tool, added simple query for heightfield height
(accessible from scripts).
|
2014-08-06 17:09:22 -07:00 |
|
AndrewMeadows
|
2653b33b67
|
Merge pull request #3257 from Atlante45/referentials
Referentials
|
2014-08-06 14:12:18 -07:00 |
|