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

4754 commits

Author SHA1 Message Date
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
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
Philip Rosedale
96a795eea4 Merge pull request #3263 from AndrewMeadows/ragdoll 
Ragdoll Part 9:
 2014-08-07 22:12:31 -07:00
ZappoMan
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
ZappoMan
84f3ede32f small change to force rebuild 2014-08-07 15:09:24 -07:00
ZappoMan
2a65de8026 todo 2014-08-07 14:48:17 -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
27b876e84c namechange _frame --> _frameCount 2014-08-07 09:02:31 -07:00
AndrewMeadows
2653b33b67 Merge pull request #3257 from Atlante45/referentials 
Referentials
 2014-08-06 14:12:18 -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
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
fe8839b4b8 CR 2014-08-06 10:40:55 -07:00
ZappoMan
ebe7182ab6 get models actually rendering again 2014-08-06 10:25:44 -07:00
ZappoMan
e540bef672 more hacking on rendering of virtual entities 2014-08-06 09:12:14 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
Andrzej Kapolka
0dbad7d0dd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 16:49:22 -07:00
ZappoMan
a194db837f first cut at registered EntityType renderers 2014-08-05 16:06:21 -07:00
ZappoMan
50309ef371 added other types, just stubs for now 2014-08-05 14:20:24 -07:00
Andrzej Kapolka
96302ca271 Provide for custom expansion according to attribute, tweak spanner attribute. 2014-08-05 14:10:39 -07:00
Brad Hefta-Gaub
b940d082f3 Merge pull request #3254 from wangyix/pull_mode_audio_output 
Audio output switched to pull mode
 2014-08-05 13:04:40 -07:00
ZappoMan
e9db4fd120 registration of multiple entity types: Model and Box 2014-08-05 12:10:17 -07:00
Atlante45
39a74cbc28 Few modifications to how avatars update their positions 2014-08-05 12:03:53 -07:00
Atlante45
9999c88d84 Added Referential getters + fixed stupid unpacking bug 2014-08-05 12:01:47 -07:00
wangyix
84c517c073 tweaked starve behavior of InboundAudioStream 2014-08-05 11:57:34 -07:00
Andrzej Kapolka
964dc4e954 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 11:03:00 -07:00
wangyix
77dad6fe65 change to fix Mac linker error 2014-08-05 11:00:27 -07:00
wangyix
748c9e2065 numAudioSamples now calculated to be device samples instead of network samples 2014-08-05 10:13:34 -07:00
Andrew Meadows
a1fccdb177 remove dangling shape pointers from PhysicsSimulation 2014-08-05 08:32:14 -07:00
Andrzej Kapolka
173e8af126 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 18:31:08 -07:00
wangyix
332e75453e Merge remote-tracking branch 'upstream/master' into pull_mode_audio_output 2014-08-04 17:58:31 -07:00
Atlante45
f0af2f022e Pack/Unpack asymetry fix + added forgotten consts 2014-08-04 17:53:21 -07:00
wangyix
c42af55f2f Merge branch 'inbound_audio_stream' into pull_mode_audio_output 2014-08-04 17:41:03 -07:00
Andrew Meadows
39d3deee90 merge upstream/master into andrew/ragdoll 2014-08-04 17:37:28 -07:00
Andrew Meadows
f126ce299a ContactPoint = set of assymetric distance consraints 2014-08-04 17:34:24 -07:00
Andrew Meadows
4beee3fecf add Shape::getVerletPoints() 2014-08-04 17:33:24 -07:00
Andrew Meadows
d1b2ba4a43 fix bug: false positive capsuleCapsule() collision 
for capsules with parallel axes and negative pojection of
center-to-center separation

also replace fabs() with fabsf()
 2014-08-04 17:30:23 -07:00