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
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
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
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
Brad Hefta-Gaub
da8f99508c
Merge pull request #4871 from huffman/console-error
...
Add error handling to JSConsole
2015-05-22 10:57:18 -07:00
Brad Hefta-Gaub
0315bb5e28
Merge pull request #4942 from ericrius1/deleteLook
...
deleted look.js (no longer needed) and removed from default scripts
2015-05-22 10:55:37 -07:00
Brad Hefta-Gaub
7ed3a97bf2
Merge pull request #4939 from Atlante45/perf_timer_tweaks
...
Deactivate PerformanceTimer when not in use
2015-05-22 10:46:13 -07:00
Clément Brisset
e276926608
Add include/remove duplicate type
2015-05-22 18:23:42 +01:00
Eric Levin
d40d9cca69
deleted look.js (no longer needed) and removed from default scripts
2015-05-22 10:02:28 -07:00
Atlante45
c6ce5e7680
PerformanceTimer deactivated when not in use
2015-05-22 18:54:40 +02:00
Philip Rosedale
3a75dc4d1e
Merge pull request #4937 from ctrlaltdavid/dde-face-detection-interval
...
Throttle DDE face acquisition attempts in order to reduce CPU usage
2015-05-22 07:42:15 -07:00
Philip Rosedale
a1d0f4e3b8
Merge pull request #4936 from ericrius1/particleFix
...
fixed problem with particle entities not showing up on other clients …
2015-05-22 07:30:57 -07:00
David Rowe
a0c3c974a9
Throttle DDE face acquisition attempts in order to reduce CPU usage
2015-05-21 19:44:38 -07:00
Eric Levin
fe99941de3
fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp
2015-05-21 19:35:27 -07:00
Brad Hefta-Gaub
9b469226f3
Merge pull request #4934 from sethalves/fix-edit-js
...
fix edit.js -- selectionManager.selections holds ids, not properties
2015-05-21 18:32:05 -07:00
Seth Alves
35b1a6eee4
selectionManager.selections holds ids, not properties
2015-05-21 18:15:05 -07:00
Philip Rosedale
05a73d8a79
Merge pull request #4933 from ericrius1/inspectFix
...
added oldMode as global vairable
2015-05-21 18:14:40 -07:00
Eric Levin
ce1ccf1c40
added oldMode as global vairable
2015-05-21 18:08:04 -07:00
Philip Rosedale
e0e1744d2e
Merge pull request #4931 from ericrius1/inspect
...
inspect now uses accurate picking and camera slerps to looks at targe…
2015-05-21 17:15:30 -07:00
Eric Levin
8a0c1cab1e
inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting
2015-05-21 15:31:30 -07:00
Stephen Birarda
986eea7c86
Merge pull request #4930 from birarda/domain-wizard
...
fix for domain-server settings account disconnect
2015-05-21 16:46:10 -04:00
Stephen Birarda
33545a0c3f
fix for domain-server settings account disconnect
2015-05-21 13:45:50 -07:00
Stephen Birarda
f4f4be7917
Merge pull request #4926 from birarda/domain-toggle
...
reload the DS merged config after making version required changes
2015-05-21 13:27:51 -04:00
Stephen Birarda
5d9f62066a
reload the merged config after making versioned changes
2015-05-21 10:27:24 -07:00
