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 |
|
Seth Alves
|
bb3d1a6a58
|
rays never pick a line entity. some fixes to pointer.js
|
2015-05-15 13:10:16 -07:00 |
|
Seth Alves
|
1161f33b45
|
laser-poiner script for mouse
|
2015-05-14 20:25:29 -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 |
|
Philip Rosedale
|
363f55c0f1
|
Merge pull request #4872 from ericrius1/hydraHockey
added hydraHockeyGrab.js, which constrains moving object to xz plane …
|
2015-05-14 15:05:44 -07:00 |
|
Andrew Meadows
|
53e241fb07
|
merge upstream/master into andrew/thermonuclear
|
2015-05-14 12:37:41 -07:00 |
|
Andrew Meadows
|
d28c400cea
|
add restitution and friction Entity properties
|
2015-05-14 12:36:59 -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 |
|
Brad Hefta-Gaub
|
b799b89dbc
|
Merge pull request #4861 from thoys/20540
CR for Job #20540 - Additions to Planky
|
2015-05-13 20:40:58 -07:00 |
|
Brad Hefta-Gaub
|
5da0a8d7a3
|
Merge pull request #4860 from howard-stearns/entity-sound
Entity sound.
|
2015-05-13 20:07:44 -07:00 |
|
Philip Rosedale
|
4811697de3
|
Merge pull request #4866 from sethalves/fix-grab.js-entity-picking
have grab.js do *accurate* picking!
|
2015-05-13 19:52:09 -07:00 |
|
Seth Alves
|
73fa1af24a
|
have grab.js do *accurate* picking!
|
2015-05-13 19:38:19 -07:00 |
|