Philip Rosedale
11844463d1
Merge pull request #4915 from AndrewMeadows/isothermal
...
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
2015-05-29 16:07:32 -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
706c837886
Use collisionSoundURL for billiards.js, instead of the global collision event.
2015-05-25 17:12:36 -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
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
Andrew Meadows
139ebca258
less bad behavior when dragging across horizon
2015-05-18 23:09:08 -07:00
Andrew Meadows
d486899aad
remove unused experimental grab placement
2015-05-18 22:54:00 -07:00
Andrew Meadows
fbd1b7e8b0
grabHockey.js can also rotate objects again
2015-05-18 22:49:23 -07:00
Andrew Meadows
b60907570a
safe to use grabHockey.js to grab misc objects
2015-05-18 22:32:20 -07:00
Andrew Meadows
bb1fe8f439
cleanup and stability for grabHockey.js script
2015-05-18 16:57:25 -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
Andrew Meadows
257a730029
keep hokey paddle in playing field
2015-05-18 09:42:55 -07: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
Nex Pro
75ddad7ec1
Added values for friction and restitution in the entity parameters.
2015-05-16 00:43:05 +01: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
Philip Rosedale
cb0112e14e
remove line pointers from grab and hockey grab
2015-05-15 13:21:58 -07:00
Seth Alves
3471c0a44f
Merge pull request #4878 from PhilipRosedale/hockeygame
...
new paddle models, low friction on field
2015-05-14 18:23:27 -07:00
Philip Rosedale
7be463388b
new paddle models, low friction on field
2015-05-14 18:22:30 -07:00
Eric Levin
7a12a4d58e
added support for both right and left hydras for hydra scripts, and made picking accurate
2015-05-14 17:00:40 -07:00
Eric Levin
ebb590e58a
added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script
2015-05-14 11:46:52 -07:00
Eric Levin
3393b60aba
added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation
2015-05-14 11:39:04 -07:00
Philip Rosedale
1e01aeb9ed
first version, air hockey game
2015-05-13 23:11:24 -07:00
Thijs Wenker
77e5e7a547
random blockheight variation in Planky
2015-05-12 21:38:49 +02:00
Thijs Wenker
b76e22c952
spelling mistake
2015-05-07 01:14:16 +02:00
Thijs Wenker
b3af1840c7
Added transparency and positioning updating of Planky button
2015-05-07 00:14:49 +02:00
Thijs Wenker
477447b95f
Planky game script
2015-05-06 23:36:44 +02:00
Seth Alves
5a7f8a2f5a
git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table
2015-04-22 17:06:21 -07:00
Andrew Meadows
f2fc781523
change shapeType to use strings in billiards.js
2015-02-23 11:42:36 -08:00
Philip Rosedale
66d1eeb327
Add textured models as balls
2015-02-19 21:11:51 -08:00
Philip Rosedale
b515a0468b
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-28 09:35:07 -08:00
Chris Collins
411541b884
Tidy up some scripts.
...
Tidy up scripts. Make some changes to some script references and
reorganize.
2015-01-27 11:04:50 -08:00
Chris Collins
d6a3b94c73
Changed references of global.js to a var
...
Changed references of global.js to a var
2015-01-15 10:48:31 -08:00
Chris Collins
816e369c08
More Script updates
...
More Script updates
2015-01-06 22:32:45 -08:00
