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
706c837886
Use collisionSoundURL for billiards.js, instead of the global collision event.
2015-05-25 17:12:36 -07:00
Atlante45
18812ab25f
Fix entityProperties.html undefined ref
2015-05-24 19:21:04 +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
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
Eric Levin
d40d9cca69
deleted look.js (no longer needed) and removed from default scripts
2015-05-22 10:02:28 -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
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
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Seth Alves
d8beed34d6
remove // ? comments
2015-05-20 16:27:28 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
6955626b77
Merge pull request #4900 from ericrius1/hockey
...
added check to airhockey script so entities that have never been crea…
2015-05-20 14:50:00 -07:00
Brad Hefta-Gaub
6d20fa72db
Merge pull request #4899 from Nex-Pro/plankyUpdate
...
Planky Game. Added values for friction and restitution in the entity parameters.
2015-05-20 14:49:39 -07:00
Brad Hefta-Gaub
75f6092023
Merge pull request #4902 from Atlante45/fix_source_url
...
Fix sourceUrl box in edit.js
2015-05-20 14:49:15 -07:00
Ryan Huffman
6f69ed2561
Fix calculated dimensions of spotlight
...
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Seth Alves
58b6205433
pull in Andrew's adjustment of paddle confinement
2015-05-18 14:10:58 -07:00
Seth Alves
34b381d48c
have airHockey.js provide the floor of the table, rather than the collision hull
2015-05-18 13:47:10 -07:00
Seth Alves
ab13eb2d16
put lowered friction back on table. incorportate Andrew's fix for the paddle crashing through the new table corners
2015-05-18 13:30:28 -07:00
Seth Alves
e2a39b4597
airhockey -- drop from slightly lower so paddle doesn't flip over. update grab script with new table name
2015-05-18 12:18:27 -07:00
Seth Alves
6d9db21d88
Merge branch 'master' of github.com:highfidelity/hifi into airhockey-hull
2015-05-18 12:09:10 -07:00
Seth Alves
5ea506f2c1
use a collision hull for table. make deletion code safer
2015-05-18 11:47:06 -07:00
Stephen Birarda
b5fb8b0d12
Merge pull request #4908 from howard-stearns/edit-script-type
...
Fix (long-standing?) typo in edit.js file reference.
2015-05-18 13:37:45 -04:00
Howard Stearns
adfe21b743
Fix (long-standing?) typo in edit.js file reference.
2015-05-18 10:28:47 -07:00
Andrew Meadows
257a730029
keep hokey paddle in playing field
2015-05-18 09:42:55 -07:00
Atlante45
9d27108acb
Fix sourceUrl box in edit.js
2015-05-18 13:29:13 +02:00
Eric Levin
03a4e08573
deleted unecsesary whitespace
2015-05-16 07:41:25 -07:00
Eric Levin
b6f1a1b89b
added check to airhockey script so entities that have never been created are not attempting to be deleted
2015-05-16 07:34:32 -07:00
Philip Rosedale
831148e280
Merge pull request #4888 from sethalves/finglonger
...
more pointer.js fixes
2015-05-15 17:18:32 -07:00
Philip Rosedale
1c3873358d
Merge pull request #4896 from huffman/update-web-icon
...
Update web icon
2015-05-15 17:18:11 -07:00
Philip Rosedale
534869a7ad
Merge pull request #4889 from ericrius1/dice
...
changed dice to use collisionSoundURL prop
2015-05-15 17:17:45 -07:00
Nex Pro
75ddad7ec1
Added values for friction and restitution in the entity parameters.
2015-05-16 00:43:05 +01:00
Ryan Huffman
a0369d243a
Update web icon
2015-05-15 15:58:02 -07:00
Eric Levin
9bfca7f54d
'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon'
...
'
2015-05-15 15:43:23 -07:00
Eric Levin
6e1c5d704c
'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on
2015-05-15 15:24:10 -07:00
Seth Alves
60bd345e57
shorter timeout
2015-05-15 14:20:29 -07:00
Seth Alves
0d3add8596
left mouse button only
2015-05-15 14:16:06 -07:00
Seth Alves
aeb5cead65
more fixes to pointer.js
2015-05-15 14:02:25 -07:00
Eric Levin
9c6be26290
changed dice to use collisionSoundURL prop
2015-05-15 13:55:48 -07:00
Seth Alves
042713d1ec
Merge branch 'master' of github.com:highfidelity/hifi into finglonger
2015-05-15 13:55:28 -07:00
Seth Alves
f535bd2a76
more fixes to pointer.js
2015-05-15 13:54:24 -07:00
Seth Alves
de8d06acf6
Merge pull request #4887 from PhilipRosedale/hockeygame
...
remove line pointers from grab and hockey grab
2015-05-15 13:43:55 -07:00
Philip Rosedale
cb0112e14e
remove line pointers from grab and hockey grab
2015-05-15 13:21:58 -07:00
