Thijs Wenker
4596711005
Merge branch 'master' of https://github.com/worklist/hifi into 20552
2015-07-15 19:17:28 +02:00
Thijs Wenker
6926ae9aa3
small planky improvements
2015-07-14 20:27:51 +02:00
Howard Stearns
c49851cf03
Update sword script for current controller/physics behavior.
2015-07-14 09:33:08 -07:00
Thijs Wenker
b711022796
planky:
...
- removed workaround for delayed overlay loading
- make buttons functional (reset, cleanup, save-default)
- only show live changes for the visual planky properties: blocksize , numLayers etc. (no physical properties)
2015-07-14 12:28:49 +02:00
Thijs Wenker
8ed9eb0633
Merge branch 'master' of https://github.com/worklist/hifi into 20552
2015-07-14 12:03:43 +02:00
Thijs Wenker
222234cf1d
wild planky changes on value change
2015-07-14 03:40:58 +02:00
Thijs Wenker
6d1df03617
planky: load / save settings
2015-07-14 03:19:23 +02:00
Thijs Wenker
1f453e07e3
connection between planky script and web-window
...
-load settings
-include toolbar
2015-07-14 02:18:17 +02:00
Howard Stearns
c340d336dc
Functional sword script:
...
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
2015-07-10 15:43:56 -07:00
Thijs Wenker
12f34a71ab
Merge branch 'master' of https://github.com/worklist/hifi into 20552
2015-07-09 20:57:34 +02:00
Thijs Wenker
c6b3801d0b
proper block offset calculations
2015-07-09 20:53:09 +02:00
Philip Rosedale
542a5f100a
Merge pull request #5280 from BingShearer/airhockey
...
Air Hockey UI Fix
2015-07-09 10:04:21 -07:00
Howard Stearns
c8da325213
Fudge the offset so that operates only when using the mouse.
2015-07-08 16:59:54 -07:00
Bing Shearer
ba4049754a
Restored indentatioN
2015-07-08 16:53:55 -07:00
Bing Shearer
6080ec4509
Air Hockey UI now follows window border
2015-07-08 16:29:43 -07:00
Howard Stearns
6813a3afe1
Sword:
...
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
2015-07-08 15:27:45 -07:00
Howard Stearns
ef4620cabb
Add a button to create/toggle-away sword.
...
When brandished, display hit points (in overlay for this user).
2015-07-08 11:52:37 -07:00
Howard Stearns
11e52c8ae0
Baseline versions of fight club scripts.
2015-07-07 14:41:03 -07:00
Thijs Wenker
90284b8bb4
fixes mysterious button display bug
2015-07-07 21:33:28 +02:00
Thijs Wenker
da6986f759
Planky refactorings and basic planky settings
2015-07-07 21:06:12 +02:00
Brad Hefta-Gaub
24fda9a733
Merge pull request #5085 from SamGondelman/master
...
Exposing Input Key Binding To JavaScript
2015-06-11 14:41:34 -07:00
Sam Gondelman
b1b2d1f85c
;) (added semicolons to js example)
2015-06-09 09:45:19 -07:00
Eric Levin
6d59518149
added meditative ocean landscape and common utilities file
2015-06-08 14:02:38 -07:00
Sam Gondelman
dd12e4740e
example script for controller scripting, input mapping
2015-06-05 10:14:13 -07:00
Howard Stearns
5727400b9a
Sound toys script (in examples/soundToys.js)
2015-06-04 14:20:19 -07:00
Eric Levin
8dda86f80d
added brownianFun script to apply random forces to balls in a pen
2015-05-29 17:02:51 -07:00
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
ae73e68f7b
Update header.
2015-05-26 13:27:37 -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
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -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
