Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Seth Alves
7979fb38cf
don't always send actiondata along with other physics related properties
2015-11-13 09:25:17 -08:00
Seth Alves
dbaea5770a
include action data in properties suppressed by non-simulation ownership
2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
ecaa50c0ff
fix for infinite loop in erase entities special packet
2015-11-12 18:25:18 -08:00
Seth Alves
cffe4551dd
merge from upstream
2015-11-11 16:15:07 -08:00
Seth Alves
07f3d8eca0
more debugging prints
2015-11-11 16:03:08 -08:00
Brad Hefta-Gaub
2f903a9513
CR feedback and some cleanup
2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a
remove some logging
2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014
more debugging
2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
866116d285
more debugging
2015-11-11 12:13:47 -08:00
Seth Alves
31ebe5dba1
terse logging for sim ownership
2015-11-11 08:51:10 -08:00
Seth Alves
39b92d2b52
terse log when ownership changes
2015-11-10 17:06:12 -08:00
Brad Hefta-Gaub
3316b63bf6
add a fixme comment
2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8
keep some additional erase entities history and send to viewers
2015-11-10 15:31:51 -08:00
Seth Alves
df5d161721
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:02:17 -08:00
Seth Alves
5e4f30b2bb
improve terse entity logging. change how action data sending is triggered
2015-11-10 13:58:09 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
Seth Alves
7b08d047b1
when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity
2015-10-22 16:59:56 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
ericrius1
dcb37ccd73
Removed whitelist and raypicking code from octree, fixed a small bug with polylines
2015-10-19 13:14:19 -07:00
ericrius1
8c229d88a8
moving whitelist code out of octree
2015-10-19 11:59:44 -07:00
Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -07:00
Stephen Birarda
e5825daa57
Merge pull request #6090 from ZappoMan/fixStat
...
Add some additional stats for debugging edit lags
2015-10-15 16:00:29 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
93113af2d2
improve server error message for failed edit
2015-10-15 11:55:20 -07:00
Seth Alves
9a9e5b962e
make edit logging terse vs not a domain-server setting
2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d
terse entity-edit logging
2015-10-14 09:31:44 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Seth Alves
b1c5a04531
respond to code review
2015-09-11 09:29:52 -07:00
Brad Davis
b7ffb96adf
Working on thread safety for the entity tree
2015-09-10 22:28:50 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Stephen Birarda
6860f3d126
add readWithoutCopy for clarity in Packet read
2015-08-19 14:32:26 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
Stephen Birarda
8921f59e23
fix entity packet send from interface client
2015-07-16 12:09:35 -07:00
Ryan Huffman
44c99ef89a
Replace bytesAvailable with bytesLefToRead
2015-07-15 10:44:51 -07:00
Stephen Birarda
0327a8d477
fix bytesAvailable, don't double seek in Packet
2015-07-14 20:47:16 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Atlante45
846e9f8105
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 19:10:06 -07:00
Stephen Birarda
c2ae73650c
go back to writing the number of deleted IDs
2015-07-08 19:03:42 -07:00
Atlante45
4bc71bb39e
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:55:14 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Atlante45
d4e01742e5
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:40:18 -07:00
Atlante45
e2718d5c94
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-08 18:26:36 -07:00
Stephen Birarda
5dc09692b4
more packet creation fixes for entitites
2015-07-08 18:13:06 -07:00
Stephen Birarda
ac40790841
remove a bad replacement from PacketType in EntityTree
2015-07-08 16:54:56 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Stephen Birarda
ffa6edc904
fix spaces created by xcode find/replace
2015-07-07 15:01:19 -07:00
ZappoMan
a59fd44014
quiet some log spam
2015-07-07 09:04:20 -07:00
ZappoMan
2aa345dfc6
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-03 15:04:59 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Stephen Birarda
812b18c74e
Merge pull request #5205 from SeijiEmery/unit-tests
...
Unit tests
2015-07-02 20:58:09 -04:00
Stephen Birarda
b3c3e5a6c8
more PacketType to PacketType::Value replacements
2015-07-02 16:49:19 -07:00
ZappoMan
b568e895ec
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-02 15:00:09 -07: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
5c4d4893de
added bytes per edit stats
2015-07-02 13:44:28 -07:00
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -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
Seth Alves
d4461f1ecb
put avatars and embedded-webserver and entities logging into their own QLoggingCategory
2015-04-06 16:22:54 -07:00
ZappoMan
45ab438339
add logging for delete operations in the server
2015-04-02 16:44:04 -07:00
ZappoMan
84940d8e43
fix SVO import
2015-04-02 14:13:19 -07:00
Seth Alves
4e83301c65
add a bool value to Node which indicates if it is allowed to rez new entities
2015-03-31 18:27:46 -07:00
ZappoMan
df99c314aa
fix issue with preload not being called on import
2015-03-31 12:44:44 -07:00
ZappoMan
a765b4c8a5
fix to preload getting called when you change a script
2015-03-27 18:56:55 -07:00
Brad Hefta-Gaub
a5294ae3fa
Merge pull request #4436 from sethalves/persist-entities-as-json
...
Optionally persist entities as json
2015-03-17 21:53:17 -07:00
Clément Brisset
9acc4a1a8f
Merge pull request #4457 from ZappoMan/quietLogs
...
dont report deleteEntity warnings in client for delete messages coming back from server
2015-03-17 15:42:20 +01:00
Seth Alves
bed37ef49a
incorporate code review feedback
2015-03-16 13:57:22 -07:00
Seth Alves
c90ca4b425
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-16 12:13:26 -07:00
Seth Alves
2d4a95c634
move to-map recurse operator class to its own file
2015-03-16 11:54:50 -07:00
ZappoMan
7ddd54b782
dont report deleteEntity warnings in client for delete messages coming back from server
2015-03-16 11:11:07 -07:00
Seth Alves
32c79f6172
bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code
2015-03-16 09:17:32 -07:00
Atlante45
ad16f49d01
Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection
2015-03-16 14:28:24 +01:00
Seth Alves
6c4b808813
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-15 07:10:56 -07:00
Atlante45
7911974946
Added findEntities for AAbox
2015-03-13 13:55:26 +01:00
Seth Alves
c9eacd2197
remove unneeded debug print
2015-03-12 11:37:53 -07:00
Seth Alves
e66ac7f982
formatting
2015-03-12 11:29:47 -07:00
Seth Alves
4aa7b0eb0f
provide defaults for anything entity properties read from a map
2015-03-12 11:19:47 -07:00
Ryan Huffman
5c9ec6bdcc
Add add/delete/rename/clear events to EntitiesScriptingInterface
2015-03-12 11:17:07 -07:00
Seth Alves
ac882f86e2
backup code is now aware of possible file extension differences
2015-03-12 09:13:53 -07:00
Seth Alves
2a06816f71
added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting
2015-03-11 23:09:15 -07:00
Seth Alves
291f239727
if we read an entity with no id, create a random one for it
2015-03-10 11:55:20 -07:00
Seth Alves
088e23ad54
saving and loading largely works. still some rough edges
2015-03-10 11:31:48 -07:00
Seth Alves
afd2c87dfe
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-10 10:12:43 -07:00
Seth Alves
2076de9153
started on reading entities from json file
2015-03-10 10:12:29 -07:00
Seth Alves
d0bbac2eb6
json writer sort of works. started on reader
2015-03-09 17:55:58 -07:00
Seth Alves
81dc7cb8cf
started on code to persist entities to file as json rather than in the wire protocol
2015-03-09 13:38:18 -07:00
Andrew Meadows
ba6e66f169
merge upstream/master into andrew/isentropic
2015-03-07 18:03:49 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Ryan Huffman
2c68d56059
Update Entity::sendEntities to return new entity ids
2015-03-05 12:34:05 -08:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
ZappoMan
e99ffb8307
fix bug in export
2015-03-04 16:29:34 -08:00
Andrew Meadows
d7d25a6509
Octree::findCapsulePenetration() uses meters
2015-03-04 16:16:49 -08:00
Andrew Meadows
ca1c9b4105
EntityItem::findEntities() uses meters
2015-03-04 16:05:29 -08:00
Andrew Meadows
90b69b1ee0
replace some "InDomainUnits" calls with "InMeters"
2015-03-01 15:58:10 -08:00
Andrew Meadows
e1954d3e1d
spherical queries into Octree use meters
2015-03-01 15:19:26 -08:00
Andrew Meadows
7210c7a88b
added EntityTree::findEntitiesInMeters()
...
progress toward conversion to meters
2015-02-26 15:16:59 -08:00
Andrew Meadows
93c77d557a
EntityTree::findClosestEntity() now takes meters
2015-02-26 14:14:17 -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
ZappoMan
bc5a1477e6
added logging of edit commands in the server
2015-02-13 14:59:57 -08:00
Seth Alves
60a4f48985
rather than a list of allowed editors, a list of allowed lockers/unlockers
2015-02-06 09:14:40 -08:00
Ryan Huffman
2b00e3fadc
Add force option to deleteEntity
2015-02-04 10:49:49 -08:00
Ryan Huffman
f65640a593
Update EntityTree.cpp to not delete entity when locked
2015-01-27 10:24:54 -08:00
Andrew Meadows
f8c512b690
fix deleteEntity() to actually delete result
2015-01-08 12:42:16 -08:00
Andrew Meadows
c37c1515ba
EntitySimulation is lockable
...
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
2015-01-08 10:22:25 -08:00
Andrew Meadows
da551a0a76
restore script change detection to what it was
2014-12-30 11:56:39 -08:00
Andrew Meadows
213133c705
restoring EntityTreeElement::cleanupEntities()
2014-12-29 15:19:25 -08:00
Andrew Meadows
85fd1fc14f
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
2014-12-18 13:46:06 -08:00
Andrew Meadows
28381a3b70
cleanup of EntityItem::_created timestamp logic
...
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
2014-12-18 11:39:02 -08:00
ZappoMan
a465aa20ff
more Application and Menu dependency removal
2014-12-17 11:41:42 -08:00
Andrew Meadows
67c3a25475
Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.h
2014-12-15 14:46:46 -08:00
Andrew Meadows
4c74c041c2
remove unused cruft
2014-12-10 16:59:49 -08:00
ZappoMan
426517b072
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
2014-12-09 17:11:01 -08:00
Andrew Meadows
bc22e5723c
bundle the flags that EntitySimulation cares about
2014-12-09 12:55:58 -08:00
Andrew Meadows
3fd2f12a73
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItem.h
libraries/entities/src/EntitySimulation.h
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/SimpleEntitySimulation.cpp
libraries/entities/src/SimpleEntitySimulation.h
libraries/entities/src/SphereEntityItem.cpp
2014-12-09 12:41:53 -08:00
Andrew Meadows
d4c72ab203
handle case where EntityItem's script has changed
2014-12-08 17:16:45 -08:00
Andrew Meadows
9e9929da91
merge upstream/master into andrew/thermonuclear
2014-12-08 11:22:39 -08:00
ZappoMan
497fbade9b
fix crash in entity related AC scripts
2014-12-08 06:48:04 -08:00
Andrew Meadows
7d96ad5836
cleanup of EntitySimulation API
...
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
2014-12-05 18:08:53 -08:00
ZappoMan
cd92185c5b
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
...
Conflicts:
examples/newEditEntities.js
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
libraries/entities/src/EntityTree.h
2014-12-03 15:07:47 -08:00
ZappoMan
63d1ac8375
implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle
2014-12-02 14:56:12 -08:00
Andrew Meadows
1df6c32a4e
moving Shape* back into shared lib
...
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
2014-12-01 16:03:14 -08:00
Andrew Meadows
051b04402f
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTree.h
2014-11-26 17:21:11 -08:00
Andrew Meadows
0b56169c6e
fix build after merge
2014-11-26 17:18:19 -08:00
Andrew Meadows
3781c23480
add entities to simulation after unpacking
2014-11-26 17:09:53 -08:00
Andrew Meadows
5acaaa9c3b
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/entities/EntityCollisionSystem.cpp
libraries/entities/src/EntityItem.h
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTree.h
libraries/entities/src/EntityTreeElement.cpp
2014-11-26 15:36:08 -08:00
Andrew Meadows
dd3a7b9b9d
EntitySimulation takes EntityItem* rather than ID
2014-11-26 12:12:43 -08:00
Andrew Meadows
1c636fe6b2
more correct entity list maintenance
2014-11-24 20:37:09 -08:00
Andrew Meadows
ec1f11c1a8
route more entity updates into physics engine
2014-11-24 11:21:40 -08:00
Andrew Meadows
51da678675
update entity MotionType when it changes
2014-11-19 17:05:31 -08:00
Andrew Meadows
961dc5a231
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItem.h
2014-11-19 15:41:53 -08:00
Andrew Meadows
48164c9399
cleanup and moving things around
2014-11-19 15:31:17 -08:00
Andrew Meadows
97d1dc4200
use updateFoo() where entity properties need relay
...
clear EntityItem updateFlags when processed
2014-11-19 15:12:22 -08:00
Andrew Meadows
388830c2a2
Merge branch 'bispinor' into inertia
...
Conflicts:
interface/src/entities/RenderableModelEntityItem.cpp
libraries/entities/src/BoxEntityItem.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItem.h
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTree.h
libraries/entities/src/EntityTreeElement.cpp
2014-11-18 10:23:38 -08:00
Andrew Meadows
2d400e6ae0
rename PhysicsWorld to PhysicsEngine
2014-11-18 09:55:25 -08:00
Andrew Meadows
47615ba9c2
changeEntityState() --> updateEntityState()
2014-11-17 17:38:26 -08:00
Andrew Meadows
af606f01a9
combined SimulationStates Moving and Changing
...
also funnel entity updates by UDP packet through a single list
2014-11-17 17:35:44 -08:00
Andrew Meadows
ac87c90d62
Remove Changing state, now keep QSet of changes
2014-11-17 15:53:03 -08:00
Andrew Meadows
2f9a35412f
initial support for STATIC and KINEMATIC motion
2014-11-14 15:56:52 -08:00
ZappoMan
11058355a0
implement aboutToFinish for persist thread to allow final save before shutdown
2014-11-14 09:55:32 -08:00
Andrew Meadows
40b9416810
cleanup motionstate on EntityItem delete
2014-11-14 09:04:09 -08:00
Andrew Meadows
1bed4eeb5b
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/entities/src/EntityTree.cpp
2014-11-13 10:53:23 -08:00
Andrew Meadows
66857b823f
EntityTree has a PhysicsWorld
2014-11-11 17:34:00 -08:00
ZappoMan
8ec3f8ce99
implement support for calling preload when the script changes
2014-11-11 14:21:06 -08:00
ZappoMan
2bc7896dee
first cut at preload script behavior
2014-11-11 13:46:48 -08:00
ZappoMan
542d671e54
cleanup entity scripts when changing domains or entity is deleted
2014-11-06 20:01:09 -08:00
ZappoMan
768a854b00
cleanup
2014-11-06 14:00:26 -08:00
ZappoMan
90b079d5a8
remove debug
2014-11-06 13:51:48 -08:00
ZappoMan
2b62402a57
possible fix for entities not always updating bug
2014-11-06 13:17:46 -08:00
ZappoMan
13e358549d
add periodic pruning of the octree on load and save
2014-11-05 14:56:38 -08:00
