Brad Hefta-Gaub
0d37511071
add support for scripts to call methods on entity scripts
2015-09-18 14:06:38 -07:00
Seth Alves
93dc0714f7
quiet compiler
2015-09-12 10:10:53 -07:00
Brad Davis
2daa5c3bf6
PR comment, fix extra variable decl
2015-09-11 16:54:18 -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
Brad Davis
fd1cfadc47
Fixing potential access to null object
2015-09-11 12:02:57 -07:00
Seth Alves
b1c5a04531
respond to code review
2015-09-11 09:29:52 -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
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Seth Alves
7369ca19e9
allow setting cuboid voxel spaces. clean up some locking
2015-08-31 18:01:15 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
Seth Alves
b129c2a933
in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript
2015-08-16 09:36:54 -07:00
Seth Alves
5ecdbaa19d
have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords
2015-08-15 15:18:25 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
ericrius1
9125b3a2a9
attempting to fix windows and linux builds again
2015-08-03 14:53:02 -07:00
ericrius1
e36099f2b6
fixing ambiguous "call to overloaded function compiler" errors on windows and linux builds
2015-08-03 12:31:21 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
bwent
aab1f70800
Renaming vars
2015-07-31 10:47:05 -07:00
bwent
67760fad79
Add gettable naturalPosition property for model entities
2015-07-31 10:15:35 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
ericrius1
0ce6737b34
merged and normals flipping
2015-07-13 09:43:15 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Seth Alves
2dc4922da3
bring over code from entity-level-locking branch
2015-07-09 15:23:05 -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
Stephen Birarda
b3c3e5a6c8
more PacketType to PacketType::Value replacements
2015-07-02 16:49:19 -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
Atlante45
ee13407066
Fix smart pointer casts
2015-07-01 19:22:40 -07:00
ericrius1
ad54b4c0b0
changed quad entity to PolyLine
2015-07-01 17:18:36 -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
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
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
c87e7c99ce
bid for ownership on script-change phys properties
2015-06-26 21:57:04 -07:00
Andrew Meadows
4b29907216
trigger bid for ownership on action manipulations
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
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
6e34678a59
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 10:48:21 -07:00
ericrius1
9dc6846eba
rendering wad entity
2015-06-22 15:12:35 -07:00
