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

15642 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
a96aa5f937 clean up subclass properties, properly handle new baseclass props like damping 2014-08-10 14:20:37 -07:00
ZappoMan
55e12baf78 more base class properties work 2014-08-08 18:06:16 -07:00
ZappoMan
eda5614a75 implement readEntitySubclassDataFromBuffer() for BoxEntityItem 2014-08-08 17:59:32 -07:00
ZappoMan
2892c37210 implement readEntitySubclassDataFromBuffer() for EntityItem 2014-08-08 17:55:56 -07:00
ZappoMan
90c7989765 implement appendSubclassData() for EntityItem 2014-08-08 17:38:26 -07:00
ZappoMan
ebc3013904 more work on more properties 2014-08-08 16:42:31 -07:00
ZappoMan
b509eed59a more property work 2014-08-08 16:20:03 -07:00
ZappoMan
8219e6c4af add dampling and velocity to editModels.js 2014-08-08 16:01:15 -07:00
ZappoMan
914b20a862 more entity item base class properties 2014-08-08 15:57:43 -07:00
ZappoMan
f899dc1f79 moving entity edit packet encode/decode to the EntityItemProperties class 2014-08-08 15:41:55 -07:00
ZappoMan
275a5c4a47 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 15:13:55 -07:00
ZappoMan
b7767b7971 get referentials compiling with new Entity ID changes 2014-08-08 15:12:57 -07:00
AndrewMeadows
9d48522dd9 Merge pull request #3267 from birarda/avatar-ghosting 
fix for avatar ghosting on parsing of avatar with last session uuid
 2014-08-08 14:37:17 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -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
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
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
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
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
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
AndrewMeadows
2653b33b67 Merge pull request #3257 from Atlante45/referentials 
Referentials
 2014-08-06 14:12:18 -07:00
Philip Rosedale
dc4f57b30f Merge pull request #3259 from Atlante45/fix_avatar_not_fading_out 
Fix avatar not fading out
 2014-08-06 13:39:59 -07:00
ZappoMan
720f60b99e fixed bad ids from constructing entities from buffers 2014-08-06 12:52:40 -07:00
ZappoMan
b7b89dcbec move glow effect to property of all entities, add tools for editing boxes 2014-08-06 12:29:09 -07:00
Atlante45
de8c7fb204 Fix avatar not fading out 2014-08-06 12:14:36 -07:00
Andrzej Kapolka
c384abedcc Merge pull request #3258 from Atlante45/fix_voxel_bug 
fix voxel bug
 2014-08-06 11:46:38 -07:00