Stephen Birarda
fa71c781f4
cleanup edit message memory management in octree packet sending
2015-07-08 14:12:04 -07:00
Seth Alves
b19d505fc1
remove stray debug print
2015-07-01 20:32:45 -07:00
Seth Alves
246861221c
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
2015-07-01 20:17:21 -07:00
Seth Alves
6e3cab9f4d
fix logic problem with previous fix
2015-07-01 12:37:15 -07:00
Seth Alves
593ed9f998
work around problem where EntityItem::setActionData is called before the entity tree is set up
2015-07-01 12:26:51 -07:00
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
a300dec1f7
update entity data bytes whenever it's asked for
2015-06-30 10:42:34 -07:00
Seth Alves
9b7ea19087
include action type in arguments delivered to scrips
2015-06-29 14:33:58 -07:00
Seth Alves
1d122060a6
merge andrew's sim-ownership branch
2015-06-29 09:50:38 -07:00
Andrew Meadows
769755e30a
recycle PROP_SIMULATOR_ID
2015-06-29 06:20:14 -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
ff67b54f87
don't read terse update data for objs we own
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
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
Andrew Meadows
82ba5cd4b6
sim ownership uses expiry, apply priority rules
2015-06-26 21:57:04 -07:00
Andrew Meadows
443c7d9c70
allow equal priority to take simulation ownership
2015-06-26 21:57:04 -07:00
Andrew Meadows
8afd9a5e1d
add EntityItem::_simulatorPriority as uint8_t
2015-06-26 21:57:04 -07:00
Seth Alves
9f6ec4120d
undo previous experiment
2015-06-26 18:43:56 -07:00
Seth Alves
0739c46249
if new action data is the same as the old action data, don't re-unpack it
2015-06-26 18:13:53 -07:00
Seth Alves
b4537b081f
fix clearActions
2015-06-26 16:02:47 -07:00
Seth Alves
bc7271769c
merge from master
2015-06-26 14:29:40 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
d09588b7fa
put upper bound on size of serilized action parameters so they'll fit in MTU
2015-06-26 12:11:34 -07:00
Seth Alves
0af137af36
save encoded action data rather than generating it on demand
2015-06-23 15:27:25 -07:00
Seth Alves
7f4e3f8216
when deserializing action, remove any existing actions that weren't part of the serialized data
2015-06-22 13:12:34 -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
fca06d9d3d
add actionData to properties that EntityItem transmits and receives
2015-06-19 09:36:06 -07:00
Seth Alves
fce551099f
first stab at sending action data across wire
2015-06-18 18:32:57 -07:00
Seth Alves
32cf669d8b
moving toward sending actions over wire
2015-06-18 17:51:41 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Seth Alves
4a00bd3e7f
quiet compiler
2015-06-15 16:06:20 -07:00
Niraj Venkat
182a3e918c
Hyperlink properties now propagate locally and over network
2015-06-10 13:12:18 -07:00
ZappoMan
5d6112d9c5
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-08 12:29:32 -07:00
ZappoMan
7dc0e8a66c
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 12:21:29 -07:00
Seth Alves
b425cc6491
merge from upstream
2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040
Merge pull request #5053 from AndrewMeadows/isothermal
...
fix crash during bogus reconnect on login
2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d
use const references for arguments in action-related calls
2015-06-05 11:26:54 -07:00
ZappoMan
f8a2fff5a7
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 11:06:10 -07:00
Seth Alves
28c034698f
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-05 10:41:20 -07:00
