Commit graph

712 commits

Author SHA1 Message Date
Seth Alves
d51f5a0ae8 remove commented out code 2015-04-22 17:22:37 -07:00
Seth Alves
5a7f8a2f5a git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table 2015-04-22 17:06:21 -07:00
Seth Alves
96b4517e6e when removing something from bullet, attempt to wake up anything that was touching it 2015-04-22 16:05:31 -07:00
Seth Alves
07a848c9ce added bump call in physics engine for when an entity is deleted and may have something resting on top of it 2015-04-22 15:50:39 -07:00
Seth Alves
7781808bea remove debug prints, fix a comment 2015-04-22 15:25:09 -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
Seth Alves
cd3ee39fcc experimenting 2015-04-22 13:42:04 -07:00
Seth Alves
3f705f3172 keep track of the number of simulation steps each entity has been accelerated at nearly its gravity. if we get 4 in a row, start sending acceleration equal to gravity to the entity server, so it will include gravity in its estimates 2015-04-22 10:39:13 -07: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
cde64893af coding standard 2015-04-21 18:36:06 -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
d6c8bd94cf clean up some debugging prints 2015-04-20 15:59:33 -07:00
Seth Alves
56b005a872 packets should be ignore if they contain local nodeID, not if local entity contains nodeID 2015-04-20 12:19:36 -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
adfc82e169 remove commented-out code 2015-04-17 15:10:34 -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
d90dec066c if an entity has no simulatorID, pull it out of list of entities with simulatorIDs 2015-04-17 11:12:13 -07:00
Seth Alves
32ced31f60 adjust logic related to claiming and releasing simulation ownership during scripted changes to entities 2015-04-17 10:57:00 -07:00
Seth Alves
3da2d1680d fix code that causes scripted changes to physics-related entity properties to claim simulation ownership 2015-04-17 10:41:11 -07:00
Seth Alves
deec577db6 if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race 2015-04-17 10:21:52 -07:00
Seth Alves
c69aaa806b if a uuid is null, don't send a uuid of all zeros 2015-04-17 09:55:49 -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
f48f9caea4 cut back on debuging prints 2015-04-16 16:18:13 -07:00
Seth Alves
1484d6e37f fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version 2015-04-16 16:10:01 -07:00
Seth Alves
3b2a15f76a more debugging 2015-04-16 15:52: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
d7881f1891 adjust logic for releasing ownership of simulation 2015-04-16 15:15:28 -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
6c4d232ad9 respond to code review 2015-04-15 16:08:15 -07:00
Seth Alves
e3a90b80a4 fix typo in comment 2015-04-15 16:04:18 -07:00
Seth Alves
62b59b7ccc remove uneeded debug print 2015-04-15 11:02:12 -07:00
Seth Alves
afca5440f0 entity-server will automatically clear simulation-owner ID if it doesn't get an update for 2 seconds 2015-04-15 10:58:56 -07:00
Seth Alves
e5db2380bf Merge branch 'bispinor' of github.com:AndrewMeadows/hifi into acceleration-and-owner-in-wire-protocol 2015-04-14 15:44:59 -07:00
Seth Alves
2a87eb9ce1 pull from andrew's branch 2015-04-14 15:44:53 -07:00
Andrew Meadows
aec42cf2dc enforce ShapeType agreement for ModeEntityItem 2015-04-14 15:39:49 -07:00
Andrew Meadows
5b81b5b11b removing SHAPE_TYPE_CONVEX_HULL from entities lib 2015-04-14 14:56:32 -07:00
Seth Alves
3cf31ff701 fix to allow modelEntityItems with shape of box into physicsengine. ignore entity updates echoed back to us. stop broadcasting after 3 non-moving updates 2015-04-14 13:32:02 -07:00
Seth Alves
b5bfbba759 only set simulationID on scripted entity creation if the entity has velocity or rotation 2015-04-14 10:17:54 -07:00
Seth Alves
d330319ed9 when a script creates and object, set the local Node as the simulation owner 2015-04-14 09:56:39 -07:00
Seth Alves
f7c0637952 oops 2015-04-13 16:51:05 -07:00
Seth Alves
cf6259c5d7 turn down debugging 2015-04-13 16:41:38 -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