Stephen Birarda
812b18c74e
Merge pull request #5205 from SeijiEmery/unit-tests
...
Unit tests
2015-07-02 20:58:09 -04:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ZappoMan
24b4614703
add more detailed edit timing to entity server
2015-07-01 16:11:08 -07:00
Seth Alves
7d7e3769f6
suppress a log message
2015-06-30 09:56:15 -07:00
Seiji Emery
374150a39f
Merge https://github.com/highfidelity/hifi
2015-06-29 11:56:50 -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
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
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
Seiji Emery
dfe58a5ed4
Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point.
2015-06-22 17:42:07 -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
b425cc6491
merge from upstream
2015-06-05 11:56:33 -07:00
Andrew Meadows
aff751b4e6
remove old debug assert
2015-06-04 11:26:35 -07:00
Seth Alves
9cae11cc3c
clean up actions when DeleteEntityOperator's list is processed rather than as it's made
2015-06-04 09:55:25 -07:00
Seth Alves
d634663bb1
simple action is working. destructor sequense is still suspicous
2015-06-03 17:33:55 -07:00
Seth Alves
a96520ca74
set up EntityItemPropertiesFromScript to either ignore or honor read-only properties
2015-05-29 13:43:18 -07:00
Howard Stearns
810c766f77
When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit.
2015-05-28 12:50:02 -07:00
ZappoMan
c92e7bed87
andrews CR feedback
2015-05-26 09:44:02 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Andrew Meadows
7e9e223b3e
merge upstream/master into andrew/nova
2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -07:00
Seth Alves
c35edd8eb4
some debugging on Andrew's refactor
2015-05-05 16:40:10 -07:00
Seth Alves
1cd93b9ec8
pull andrew's branch, add back in visual indicator of an entity being active in bullet
2015-05-05 13:14:22 -07:00
Stephen Birarda
6b3cf1ba4a
remove dependency of PacketHeaders on NodeList
2015-05-05 12:19:42 -07:00
Andrew Meadows
6be3cc6efb
remove debug stuff
2015-05-05 10:18:03 -07:00
Andrew Meadows
d5f4c5a0ef
add/delete/cleanup of physical entities works
2015-05-05 10:10:08 -07:00
Andrew Meadows
3031d55c8e
merge upstream/master into andrew/nova
2015-05-01 11:03:51 -07:00
Andrew Meadows
31ca5b9eef
add EntityTree::_pendingDelete for delayed deletes
...
for case where EntitySimuation needs time to remove pointers
2015-05-01 10:43:58 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
Andrew Meadows
14b6ee608a
more PhysicalEntitySimulation implementation
...
with changes to API's accordingly (does not compile yet)
2015-04-28 15:07:37 -07:00
Seth Alves
6f441e3490
if our Node isn't allowed to create entities in this domain, don't try.
2015-04-27 19:07:53 -07:00
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Seth Alves
cde64893af
coding standard
2015-04-21 18:36:06 -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
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
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
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
