Eric Levin
9f974c3b5c
moves ball marker closer to avatar for mouse as well
2015-06-05 10:19:39 -07:00
Sam Gondelman
dd12e4740e
example script for controller scripting, input mapping
2015-06-05 10:14:13 -07:00
ZappoMan
807cc3db24
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 09:37:39 -07:00
Eric Levin
30ba7ffc29
moved ball marker closer to hand so painting feels more visceral
2015-06-05 09:36:12 -07:00
Andrew Meadows
08b64666fe
Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume
...
Smooth initial crash volume
2015-06-05 08:40:09 -07:00
Seth Alves
b2db5f7fee
update grab.js to use pull-to-point action, various other fixes
2015-06-05 07:10:44 -07:00
Eric Levin
fd8126510d
marker ball now stays without mouse whether or not user is drawing
2015-06-04 21:41:19 -07:00
Eric Levin
9264ef980c
added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug
2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396
Merge pull request #5054 from ericrius1/paint
...
added paint.js and line rider script. Users can paint lines with hydr…
2015-06-04 20:52:23 -07:00
Eric Levin
f276ca30cd
refactoring for common functions. Fix for randFloat
2015-06-04 17:55:55 -07:00
Eric Levin
241330442c
added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created.
2015-06-04 17:35:26 -07:00
Eric Levin
1fd0650955
removing overlay on script ending
2015-06-04 16:54:52 -07:00
Eric Levin
a2ae51371b
updated pointer.js script to work with new line entity
2015-06-04 15:44:39 -07:00
Howard Stearns
5727400b9a
Sound toys script (in examples/soundToys.js)
2015-06-04 14:20:19 -07:00
Sam Gateau
b339aa683a
adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items
2015-06-03 11:25:45 -07:00
ZappoMan
7c40b666e8
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-06-03 09:52:40 -07:00
Sam Gateau
640071dd35
Avoiding any setVIewTransform in payloadREnder and introducing monitoring values
2015-06-02 18:23:53 -07:00
Seth Alves
a85a0b863d
icon for create-polyvox button
2015-06-02 16:25:38 -07:00
Seth Alves
20d3814c1b
code review
2015-06-02 10:00:07 -07:00
Seth Alves
175926736d
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-06-01 09:59:01 -07:00
Eric Levin
45331e5a0e
removed sounds from grab script
2015-06-01 09:37:54 -07:00
Seth Alves
00af0a4376
trying to make thing behave when voxel-space is resized
2015-06-01 07:15:37 -07:00
Seth Alves
b9202ebfb6
added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look
2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df
allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items.
2015-05-30 18:33:35 -07:00
Seth Alves
ad71d7b7a2
allow changing of voxel-volume-size with edit.js
2015-05-30 18:14:36 -07:00
Seth Alves
fe59f8846f
recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape
2015-05-30 16:43:11 -07:00
Seth Alves
96a40bd673
basic collisions with cubic polyvoxes
2015-05-29 18:50:26 -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
Seth Alves
06ffcbf24d
Merge pull request #4981 from ericrius1/blockWorld
...
tiles and block no longer delete on script end, now user can delete a…
2015-05-28 11:09:14 -07:00
Andrew Meadows
2a4cd468e4
Merge pull request #4979 from sethalves/polyvox
...
initial pass at Polyvox Entity Type
2015-05-28 10:43:50 -07:00
Eric Levin
03062fccd3
remove whiteboard by default in pointer.js
2015-05-28 10:17:47 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -07:00
Brad Hefta-Gaub
5da3a9440e
Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples
...
[REQUIRES #4962 ] Remove global collision and update examples
2015-05-27 16:09:14 -07:00
Seth Alves
95c5ed66fc
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 15:37:33 -07:00
Seth Alves
43dd8b3fb1
Merge pull request #4980 from ericrius1/pointer
...
Pointer
2015-05-27 15:37:24 -07:00
Eric Levin
8db8277bf8
tiles and block no longer delete on script end, now user can delete all the stuff with a button click instead. Also blocks now spawn with random angular velocity for spinning fun
2015-05-27 15:20:49 -07:00
Eric Levin
07c8fb6c02
turned pointer and draw funcitonality off be default
2015-05-27 15:11:16 -07:00
Eric Levin
ca85401b77
added button so user can toggle pointer on/off
2015-05-27 15:08:52 -07:00
Seth Alves
7f99f261c2
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 13:59:13 -07:00
Seth Alves
29cb5ed126
Merge pull request #4967 from ericrius1/pointer
...
modified pointer script to allow users to draw on surfaces
2015-05-27 13:56:17 -07:00
Seth Alves
429cc631f3
limit size of polyvox data property to below MTU
2015-05-27 09:48:32 -07:00
Seth Alves
0f81445cee
flag for polyvox to select minecraft vs walking-cubes. uppack to unpack
2015-05-27 07:04:44 -07:00
Eric Levin
3fb5476968
added blockWorld script to generate floor of tiles and drop jenga blocks at random points above floor
2015-05-26 16:46:01 -07:00
Eric Levin
579c62420d
added header to pointer script
2015-05-26 16:43:34 -07:00
Eric Levin
7194d4a4da
modified pointer script to allow users to draw on surfaces
2015-05-26 16:40:47 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
Howard Stearns
ae73e68f7b
Update header.
2015-05-26 13:27:37 -07:00
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
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
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
