Commit graph

2497 commits

Author SHA1 Message Date
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