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
|
3781c23480
|
add entities to simulation after unpacking
|
2014-11-26 17:09:53 -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
|
97d1dc4200
|
use updateFoo() where entity properties need relay
clear EntityItem updateFlags when processed
|
2014-11-19 15:12:22 -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 |
|
ZappoMan
|
11058355a0
|
implement aboutToFinish for persist thread to allow final save before shutdown
|
2014-11-14 09:55:32 -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 |
|
ZappoMan
|
c650cabb5d
|
support for locked property, some plumbing for textures property
|
2014-10-30 10:05:20 -07:00 |
|
ZappoMan
|
ffe1e2db00
|
fix crash in butterflies.js
|
2014-09-16 09:07:22 -07:00 |
|
ZappoMan
|
51b66bdee3
|
fixed warnings and converted several asserts to debug messages
|
2014-09-13 08:14:31 -07:00 |
|
ZappoMan
|
54ef5d4698
|
fixed bugs in MovingEntitiesOperator, improved getDistanceToBottomOfEntity, isRestingOnSurface
|
2014-09-12 07:45:33 -07:00 |
|
ZappoMan
|
695569b64b
|
reconcile use of getAACube() and handle rotations properly
|
2014-09-11 16:43:53 -07:00 |
|
ZappoMan
|
420f7de957
|
fix various crashes in entites
|
2014-09-07 20:31:54 -07:00 |
|
ZappoMan
|
9fdd1f422a
|
fix crash on change domains while entities are animating or moving
|
2014-09-06 16:54:36 -07:00 |
|
Andrew Meadows
|
3ae78da593
|
fixed signed/unsigned comparison
|
2014-09-05 16:41:51 -07:00 |
|
ZappoMan
|
60e8056cd8
|
removed some debug code
|
2014-09-05 02:20:30 -07:00 |
|
ZappoMan
|
dc31381fc1
|
better handling of old model files
|
2014-09-05 02:19:17 -07:00 |
|
ZappoMan
|
76511762dc
|
fix bug in getContainingElement() found by andrew, allow sciprting interface to return properties of local only entities
|
2014-09-03 13:14:06 -07:00 |
|
ZappoMan
|
29bbeadbc7
|
fix method names for CR feedback
|
2014-09-03 12:44:57 -07:00 |
|
ZappoMan
|
66a2f58192
|
fix to runaway saving file and optimizations to general encoding paths
|
2014-09-03 10:55:56 -07:00 |
|
ZappoMan
|
0acbefb6a2
|
fix but in getMyChildContaining and performance improvement to moving entities
|
2014-09-03 08:06:42 -07:00 |
|
ZappoMan
|
2b5d631290
|
removed a ton of old dead debug code
|
2014-09-02 08:44:43 -07:00 |
|
ZappoMan
|
2fab662e8c
|
fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit
|
2014-08-29 17:48:14 -07:00 |
|
ZappoMan
|
ad9ce2edd3
|
delete moving entities that travel outside of domain
|
2014-08-28 21:34:12 -07:00 |
|
ZappoMan
|
76c77d6994
|
first cut at properly working lifetime
|
2014-08-28 13:46:54 -07:00 |
|
ZappoMan
|
2f90df04ee
|
correct cleanup of Models/geometry and all EntityItems for various cases
|
2014-08-27 15:45:45 -07:00 |
|
ZappoMan
|
ed6363ca02
|
fixed bug in processing of entity erase messages
|
2014-08-27 14:21:06 -07:00 |
|
ZappoMan
|
5c2b674a0d
|
verify delete behavior actually frees memory associated with EntityItems
|
2014-08-27 12:07:11 -07:00 |
|
ZappoMan
|
30e00bbd69
|
final pass on entities import/export/overlays working as well as production
|
2014-08-27 11:34:50 -07:00 |
|
ZappoMan
|
b14158385c
|
first cut at getting pastEntities() working
|
2014-08-26 16:47:32 -07:00 |
|
ZappoMan
|
4895ee32f7
|
test and fix issues with exportEntities()
|
2014-08-26 15:59:49 -07:00 |
|
ZappoMan
|
700b945d71
|
disabled some debugging
|
2014-08-25 11:35:28 -07:00 |
|
ZappoMan
|
d0ceca1935
|
moved EntityTree operator related classes to own files to match coding standard
|
2014-08-25 11:29:11 -07:00 |
|
ZappoMan
|
75bb42fb73
|
debug cleanup
|
2014-08-22 10:54:00 -07:00 |
|
ZappoMan
|
3a5a38c342
|
support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file
|
2014-08-19 10:53:45 -07:00 |
|
ZappoMan
|
fbe409a0c2
|
added lots of debugging for octree edit packet sender bug fixed threading issue
|
2014-08-14 11:23:56 -07:00 |
|
ZappoMan
|
b7e258519b
|
fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet
|
2014-08-13 17:12:03 -07:00 |
|
ZappoMan
|
49e616dd49
|
first cut at using erase entity message to delete entities
|
2014-08-13 14:11:56 -07:00 |
|
ZappoMan
|
4bdb8765f5
|
implement improved pruning on updates/moves/delete passes of the tree added some debug support
|
2014-08-13 10:29:25 -07:00 |
|
ZappoMan
|
6ce6d8ae47
|
dont try to create child elements that are smaller than the entities
|
2014-08-12 14:29:55 -07:00 |
|
ZappoMan
|
8339f1059e
|
clean up more debugging noise
|
2014-08-12 13:29:14 -07:00 |
|