Seth Alves
e8a6acd65b
responses to code review
2015-07-01 10:42:04 -07:00
Seth Alves
5e2f7204b4
responses to code review
2015-07-01 10:29:42 -07:00
Seth Alves
a356cbf620
remove commented code
2015-07-01 07:33:46 -07:00
Seth Alves
6e7973f5b9
coding-standard / code-review
2015-06-30 19:28:22 -07:00
Seth Alves
505332c367
include action data among physics initiated network updates from interface to entity-server
2015-06-30 10:19:03 -07:00
Seth Alves
c3747ab8aa
initialize some variables
2015-06-29 19:40:57 -07:00
Seth Alves
88fc74374b
if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol
2015-06-29 19:27:10 -07:00
Seth Alves
fbede0a23f
guard against feeding bullet a NaN
2015-06-29 15:54:24 -07:00
Seth Alves
c539d9f233
allow for removal and readdition of an action in one time-slice without asserting
2015-06-29 12:22:06 -07:00
Seth Alves
1d122060a6
merge andrew's sim-ownership branch
2015-06-29 09:50:38 -07:00
Seth Alves
0970f010a4
provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are
2015-06-27 13:31:00 -07:00
Seth Alves
c0c1116c69
attempt some clean-ups in edge/unexpected situations
2015-06-27 11:09:28 -07:00
Seth Alves
30be515a94
remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity
2015-06-27 08:53:27 -07:00
Andrew Meadows
4d4b97fe59
add priority promotion to reduce volunteer races
...
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Andrew Meadows
e18506c77f
promote volunteer priority
...
also remove some cruft
change uint8_t to be quint8
2015-06-26 22:00:43 -07:00
Andrew Meadows
d6c69e8fe6
pack terse update parameters near each other
...
also don't constantly resend ownership data
2015-06-26 22:00:43 -07:00
Andrew Meadows
40f6ecd936
fix crash for dereference null pointer
2015-06-26 21:58:40 -07:00
Andrew Meadows
44d3074561
remove debug code
2015-06-26 21:58:03 -07:00
Andrew Meadows
12fc18092b
SimulationOwner as one property
2015-06-26 21:58:03 -07:00
Andrew Meadows
cf74dbe1dc
partial progress toward sim ownership negotiations
...
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Andrew Meadows
a33c350385
improved forcing of simulator ownership bid
2015-06-26 21:57:04 -07:00
Andrew Meadows
8510110324
increase sim priority when flagged for ownership
2015-06-26 21:57:04 -07:00
Andrew Meadows
2579247c34
claim ownership faster for scripted manipulations
2015-06-26 21:57:04 -07:00
Andrew Meadows
7c793c6397
accept simulation release from entity-server
2015-06-26 21:57:04 -07:00
Andrew Meadows
d0ac3e4514
more work on simulator priority
...
scripts that edit terse update data try to assert priority
physics simulation tries to assert "volunteer" priority
max priority rules are applied in entity server
2015-06-26 21:57:04 -07:00
Seth Alves
1326791502
add sanity check to PhysicalEntitySimulation::addAction
2015-06-26 16:55:16 -07:00
Seth Alves
31a3ca641d
clean up left-over action if it's re-added
2015-06-26 16:54:46 -07:00
Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c
Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire
2015-06-26 07:20:51 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Seth Alves
4849e2922e
quiet valgrind
2015-06-22 14:21:25 -07:00
Seth Alves
55975fd611
don't add an action of we're about to remove it
2015-06-22 13:11:42 -07:00
Seth Alves
c14276145d
lock when reading or writing _actionsToAdd or _actionsToRemove
2015-06-22 07:19:40 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Seth Alves
32cf669d8b
moving toward sending actions over wire
2015-06-18 17:51:41 -07:00
Philip Rosedale
2f080a8e29
Merge pull request #5147 from sethalves/more-actions
...
offset action
2015-06-18 17:35:50 -07:00
Seth Alves
5e80868fe0
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 16:31:07 -07:00
Seth Alves
3c90c851e9
start on code to de/serialize actions
2015-06-18 15:01:34 -07:00
Philip Rosedale
61a2196a30
Reduce error tolerances for ballistic prediction that trigger updating the server
2015-06-18 13:21:37 -07:00
Seth Alves
15f156fcd2
Merge branch 'fix-build' of github.com:sethalves/hifi into actions-over-wire
2015-06-17 15:18:39 -07:00
Seth Alves
fbfa73af2d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-17 15:18:17 -07:00
Seth Alves
68df6b662d
fix ifdefs around asserts
2015-06-17 15:03:09 -07:00
Seth Alves
44bb220130
fix debug build
2015-06-17 14:54:13 -07:00
ZappoMan
f2ba91383c
fix some warnings
2015-06-17 14:26:36 -07:00
Seth Alves
85564199c6
git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point
2015-06-17 11:22:10 -07:00
Seth Alves
4216308b9b
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 19:05:25 -07:00
Seth Alves
45c7cd4929
respond to code review, add a simple hold-a-stick script
2015-06-10 18:48:51 -07:00
Seth Alves
eccf4eb8a8
hold action works
2015-06-10 17:05:49 -07:00
