Andrew Meadows
|
3ecf959b3e
|
removed cached copies of damping and restitution
|
2015-04-24 14:50:37 -07:00 |
|
Seth Alves
|
bc65616bb3
|
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
|
2015-04-23 13:09:22 -07:00 |
|
Atlante45
|
0b1d4fb1d6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
|
2015-04-23 21:16:11 +02:00 |
|
Atlante45
|
b776ea8110
|
Make ::contains() back into a const
|
2015-04-23 19:15:06 +02:00 |
|
Seth Alves
|
c21e06e7a7
|
don't pile things up at the origin during a load
|
2015-04-23 10:08:59 -07:00 |
|
Atlante45
|
83490051d9
|
Move shape related contains() to ShapeInfo
|
2015-04-23 18:55:20 +02:00 |
|
Atlante45
|
51d99da29f
|
Magic number
|
2015-04-23 17:50:26 +02:00 |
|
Atlante45
|
f494f86ee5
|
Handle registration point in transforms
|
2015-04-23 17:48:29 +02:00 |
|
Atlante45
|
bda72025af
|
Check mesh extend before going through triangles
|
2015-04-23 16:40:40 +02:00 |
|
Atlante45
|
01f4f34911
|
Centralize contains standard cases
|
2015-04-23 13:04:59 +02:00 |
|
Seth Alves
|
9e96026c52
|
move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState
|
2015-04-22 21:36:36 -07:00 |
|
Seth Alves
|
3450597d70
|
remove some debugging prints
|
2015-04-22 15:03:23 -07:00 |
|
Seth Alves
|
92ceff1a03
|
clean up EntityItem constructors
|
2015-04-22 14:53:23 -07:00 |
|
Atlante45
|
dbf40afa47
|
Remove deprecated "*InDomainUnit" getter/setter
|
2015-04-22 21:03:55 +02:00 |
|
Seth Alves
|
e334c456ea
|
add a place to keep track of the number of simulation steps where acceleration was close to gravity for a given Entity
|
2015-04-22 10:13:13 -07:00 |
|
Seth Alves
|
c49e2c1804
|
cleanups, diff minimization
|
2015-04-20 16:52:29 -07:00 |
|
Seth Alves
|
4a5631fca6
|
cleanups, diff minimization
|
2015-04-20 16:51:28 -07:00 |
|
Seth Alves
|
6107682658
|
handle ignoring simulation data echoed back to us differently
|
2015-04-20 16:36:56 -07:00 |
|
Seth Alves
|
08d300afcd
|
use a flag to indicate that simulation ownership should be grabbed
|
2015-04-20 11:49:10 -07:00 |
|
Seth Alves
|
dac57c44da
|
if measured acceleration is close to zero, send zero to entity server, else send gravity
|
2015-04-17 15:05:47 -07:00 |
|
Seth Alves
|
f77038c52d
|
when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up
|
2015-04-17 09:37:48 -07:00 |
|
Seth Alves
|
ea8dcfa5b5
|
read UUIDs as UUIDs rather than as strings. more debugging prints
|
2015-04-16 15:33:43 -07:00 |
|
Seth Alves
|
d7059d8f2d
|
add code for uuids in wire protocol. some debugging prints
|
2015-04-16 14:46:38 -07:00 |
|
Seth Alves
|
b30b9a0a30
|
don't update _simulatorIDChangedTime unless the value is different than the current one. if a script changes an entity, attempt to claim ownership
|
2015-04-16 12:03:34 -07:00 |
|
Seth Alves
|
df37b853f7
|
setup test of lockout-period oafter simulator-owner-id change
|
2015-04-16 08:57:57 -07:00 |
|
Seth Alves
|
a30e807051
|
get rid of unneeded updateSimulatorID, set changed simulator id in properties so it gets included in outgoing packet
|
2015-04-13 16:20:30 -07:00 |
|
Seth Alves
|
396f6b1987
|
mess with debugging prints
|
2015-04-13 15:22:54 -07:00 |
|
Seth Alves
|
9c2fec36fd
|
adjust debugging, try a different DIRTY flag
|
2015-04-13 12:52:31 -07:00 |
|
Seth Alves
|
f42a43e180
|
cause changes to _simulatorID to be broadcast
|
2015-04-13 12:39:40 -07:00 |
|
Seth Alves
|
b472edbebb
|
remove debug print for something that no longer exists
|
2015-04-09 09:26:14 -07:00 |
|
Seth Alves
|
1dd01cde00
|
expand svo to hold acceleration and id of current simulator node
|
2015-04-08 15:39:34 -07:00 |
|
Seth Alves
|
d4461f1ecb
|
put avatars and embedded-webserver and entities logging into their own QLoggingCategory
|
2015-04-06 16:22:54 -07:00 |
|
Andrew Meadows
|
abd78fede5
|
fix: change of dimensions would not update physics
|
2015-04-03 15:11:57 -07:00 |
|
Ryan Huffman
|
81cb1e98ba
|
Rename attribution to marketplaceID
|
2015-03-27 13:35:58 -07:00 |
|
ZappoMan
|
81bf7138a4
|
also attempt to clean up placement of PROP_ATTRIBUTION in the stream
|
2015-03-20 13:21:29 -07:00 |
|
Atlante45
|
d3ae7cf5cf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property
|
2015-03-19 16:25:26 +01:00 |
|
Atlante45
|
8b5ade10b8
|
Initial add of the Attribution property
|
2015-03-18 18:57:05 +01:00 |
|
Seth Alves
|
a58f0fe76e
|
remove cruft, formatting
|
2015-03-14 11:57:08 -07:00 |
|
Seth Alves
|
f7f75cabf4
|
formatting
|
2015-03-13 18:49:48 -07:00 |
|
Seth Alves
|
2cf0e1ab25
|
break PhysicsEngine::addEntityInternal in half, making the 2nd part asynch. This is to allow a ModelEntityItem time to download its collision hull before the 2nd part runs
|
2015-03-12 15:58:09 -07:00 |
|
Seth Alves
|
c947f3b62c
|
use meters in wire-protocol for versions greater than VERSION_ENTITIES_USE_METERS_AND_RADIANS
|
2015-03-09 14:06:59 -07:00 |
|
Andrew Meadows
|
f5352333f0
|
entities use radians per second for angular velocity
|
2015-03-06 16:42:06 -08:00 |
|
Andrew Meadows
|
373be95297
|
entity cubes are in meters
|
2015-03-06 15:32:03 -08:00 |
|
Andrew Meadows
|
e4c68bf31c
|
committing some temp debug stuff to help git diff
(will remove this stuff later)
|
2015-03-05 18:06:08 -08:00 |
|
Andrew Meadows
|
b9cbd1ea6e
|
witch internal EntityItem data to use meters
|
2015-03-04 09:38:37 -08:00 |
|
Andrew Meadows
|
90b69b1ee0
|
replace some "InDomainUnits" calls with "InMeters"
|
2015-03-01 15:58:10 -08:00 |
|
Andrew Meadows
|
64c28fe925
|
remove EntityItem::getSize()
|
2015-02-26 15:36:59 -08:00 |
|
Andrew Meadows
|
7210c7a88b
|
added EntityTree::findEntitiesInMeters()
progress toward conversion to meters
|
2015-02-26 15:16:59 -08:00 |
|
Andrew Meadows
|
2f749e3c51
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/entities/src/TextEntityItem.h
|
2015-02-25 14:40:32 -08:00 |
|
Andrew Meadows
|
2ffb19a0ed
|
getPosition() --> getPositionInDomainUnits()
and friends
|
2015-02-25 14:35:04 -08:00 |
|