Stephen Birarda
61029fd0b1
add ability to display domain connection times
2015-05-26 15:22:25 -07:00
Stephen Birarda
857552ae0b
don't hold back link event for account connect
2015-05-26 15:16:23 -07:00
Seth Alves
66760afadb
quiet compiler
2015-05-26 14:27:22 -07:00
Seth Alves
22cc298861
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-26 14:26:11 -07:00
Seth Alves
cdef502e2e
expose setVoxelSphere to js
2015-05-26 14:26:05 -07:00
Stephen Birarda
d1489c50fe
add connection times getter to NodeList
2015-05-26 14:18:58 -07:00
Stephen Birarda
626f22191c
add a QAbstractTableModel for domain connection steps
2015-05-26 14:17:02 -07:00
Seth Alves
28e052ffdb
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-26 14:12:11 -07:00
Seth Alves
728e6d121b
changes sam made to get normals to work on a mesh
2015-05-26 14:12:01 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Seth Alves
1ec384ab4d
allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays
2015-05-26 13:43:22 -07:00
Howard Stearns
ae73e68f7b
Update header.
2015-05-26 13:27:37 -07:00
Howard Stearns
14990f29cb
Merge branch 'entity-events-in-normal-scripts' of https://github.com/howard-stearns/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:27 -07:00
Howard Stearns
3c718af43f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:02 -07:00
Seth Alves
988ecf9d55
send PolyVox voxel dimensions and compressed data over the wire
2015-05-26 13:18:52 -07:00
Seth Alves
ed6fdcfb31
add QByteArray data uppacking
2015-05-26 13:18:25 -07:00
Howard Stearns
3a7a290094
Uglify conditional returns. :-)
2015-05-26 11:38:36 -07:00
Howard Stearns
5608892a15
Remove obsolete comment.
2015-05-26 11:16:11 -07:00
Howard Stearns
bbdf9f1d9f
Remove changingEntityID.
2015-05-26 11:14:23 -07:00
Seth Alves
d71921fd03
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-26 10:46:02 -07:00
Stephen Birarda
f9251471da
add audio connection to final part of connection steps
2015-05-26 10:44:45 -07:00
Stephen Birarda
f28ade1075
log connection times for eventual stats display
2015-05-26 10:37:44 -07:00
Seth Alves
92c55d69ba
Merge pull request #4944 from AndrewMeadows/bispinor
...
avatar-avatar collisions work again
2015-05-26 10:36:54 -07:00
Stephen Birarda
eda57ff5ef
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls
2015-05-26 10:35:25 -07:00
ZappoMan
c4f96b09a2
sam's feedback on shared pointers in master
2015-05-26 09:55:28 -07:00
Seth Alves
59f68f5625
added voxel-data compression code to see what the sizes are like
2015-05-26 09:52:18 -07:00
ZappoMan
c92e7bed87
andrews CR feedback
2015-05-26 09:44:02 -07:00
Howard Stearns
de44c56aad
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 09:18:45 -07:00
Seth Alves
a251ae7f50
far is a reserved word
2015-05-26 09:06:51 -07:00
Seth Alves
f38bc469e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-26 07:28:49 -07:00
Seth Alves
727f457f91
hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version
2015-05-25 21:01:20 -07:00
Howard Stearns
d214f128cd
Miniumum change for gun to use per-entity collisions.
...
I have *not* updated this script for other recent changes (e.g., to entityIDs).
2015-05-25 17:39:15 -07:00
Howard Stearns
050829e442
typo
2015-05-25 17:23:22 -07:00
Howard Stearns
590ad22d89
Update spaceInvaders to use per-entity collision handlers.
...
Also fix bitrot:
* The 'f' key triggers a profile, after which all bets are off regarding time-dependent behavior such as lifetime and update().
(I'm moving space-invaders "fire" to the space bar as a work-around.)
* You don't get a collision without
a non-default shapeType property (if the object type is "Model")
a truthy collisionsWillMove property
* Entity handles (such as returned by Entity.addEntity) no longer have a separate 'id' property, so don't reference that. Just use the handle object itself.
* When an entity's lifetime expires, Entities.getEntityProperties(theEntityHandle) returns default values.
It looks like the space-invaders script was written at a time when this returned falsey.
(I'm changing the script to see if the properties.type === 'Unknown'.)
NOT FIXED is that the level of detail is cutting out when showing all the invaders.
2015-05-25 17:16:35 -07:00
Howard Stearns
09e9d353ea
Deprecate globalCollisionsExample.js, and add entityCollisionExample.js
2015-05-25 17:15:55 -07:00
Howard Stearns
c9932a5cf2
Merge branch 'entity-events-in-normal-scripts' into remove-global-collision-and-update-examples
2015-05-25 17:14:02 -07:00
Howard Stearns
706c837886
Use collisionSoundURL for billiards.js, instead of the global collision event.
2015-05-25 17:12:36 -07:00
Howard Stearns
069e6237cc
Noop change with more declarations, in hopes of convincing MSVS how lambdas work.
...
(Hey, it's worth a try...)
2015-05-25 16:52:14 -07:00
samcake
ffca6a6502
Merge pull request #4935 from sethalves/sam-model-fixes
...
fixes Sam made in my branch while trying to get a mesh to render
2015-05-25 16:39:25 -07:00
Howard Stearns
cbf4e09a10
Remove global collision event.
2015-05-25 16:10:50 -07:00
Howard Stearns
1b134d60d5
Fix typo that messed up the otherEntity for collisions.
2015-05-25 15:46:55 -07:00
Seth Alves
9735174036
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-25 15:37:23 -07:00
Anthony Thibault
18d683bced
Particle entities should avoid resetting simulation when setMaxParticles is called.
...
This caused all particles to disappear when a network packet was received.
2015-05-25 12:22:38 -07:00
Howard Stearns
599886079d
Restore blank line for minimum diff.
2015-05-25 11:33:12 -07:00
Howard Stearns
4266a99d78
Put the javascript methods on Script, not Entities, and other minimum-diff cleanup.
2015-05-25 11:28:33 -07:00
Howard Stearns
2b12f0bcd0
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-events-in-normal-scripts
2015-05-25 08:47:14 -07:00
Brad Hefta-Gaub
c141f41cee
Merge pull request #4960 from Atlante45/undef_ref
...
Fix entityProperties.html undefined ref
2015-05-24 12:41:11 -07:00
Howard Stearns
a0d09c0a6d
Mulitple independent handlers for same entity/event.
2015-05-24 11:48:11 -07:00
Atlante45
18812ab25f
Fix entityProperties.html undefined ref
2015-05-24 19:21:04 +02:00
Howard Stearns
b884d3cf90
Handle all the signals.
2015-05-24 09:57:12 -07:00
