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
Howard Stearns
1dd2b7275e
Simpler and more uniform version that handles all the standard entity-script events.
2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4
Working experimental first version.
2015-05-23 13:35:35 -07:00
Brad Hefta-Gaub
8c0bf19536
Merge pull request #4956 from Triplelexx/particle-entityProperties
...
expose particle properties for editing
2015-05-23 12:02:16 -07:00
Brad Hefta-Gaub
4ffe573d0d
Merge pull request #4957 from Atlante45/master
...
Fix incorrect scale constants
2015-05-23 11:47:43 -07:00
Atlante45
9e121aa387
Fix incorrect scale constants
2015-05-23 20:13:14 +02:00
Triplelexx
9a29489784
expose particle properties for editing
...
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
2015-05-23 17:57:25 +01:00
Brad Hefta-Gaub
225021671a
Merge pull request #4950 from ericrius1/particleScriptName
...
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
2015-05-22 22:17:39 -07:00
Brad Hefta-Gaub
d7b2ca64cd
Merge pull request #4949 from sethalves/octree-send-thread-adjustments
...
entity-server sends initial planky more reliably
2015-05-22 22:17:17 -07:00
ZappoMan
76c5bd1ab7
verify that entityitem cleanup is happening correctly
2015-05-22 22:01:25 -07:00
ZappoMan
31021c1dfd
more work on smart pointers
2015-05-22 21:46:05 -07:00
ZappoMan
9fa9942861
more work on smart pointers
2015-05-22 21:45:57 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Stephen Birarda
27717db9d1
fire off DS check immediately once DS info is known
2015-05-22 16:38:26 -07:00
Stephen Birarda
69f1cd80e6
immediately send ICE heartbeat once data present
2015-05-22 16:29:01 -07:00
Seth Alves
6c67d14fbc
experimenting with physics
2015-05-22 16:21:09 -07:00
Seth Alves
e702518041
adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet
2015-05-22 16:11:29 -07:00
Eric Levin
71c0aa4913
renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does
2015-05-22 15:33:38 -07:00
Seth Alves
32cc0eacfc
improve a debug print
2015-05-22 15:21:26 -07:00
Seth Alves
53fe41ef4d
improve a debug print
2015-05-22 15:11:56 -07:00
Seth Alves
945a84d24f
adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum
2015-05-22 15:01:43 -07:00
Andrew Meadows
603528eede
Merge pull request #4945 from ctrlaltdavid/fix-float-warnings
...
Fix some double to float conversion warnings in Windows builds
2015-05-22 13:09:21 -07:00
David Rowe
a01830f8f8
Fix some double to float conversion warnings in Windows builds
2015-05-22 12:32:02 -07:00
