Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ericrius1
f52d9c1293
added paint scripts for polylines
2015-07-02 14:54:09 -07:00
Seth Alves
246861221c
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
2015-07-01 20:17:21 -07:00
Sam Gateau
d019ef4373
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Brad Davis
566842389b
Animation performance test script
2015-07-01 17:04:48 -07:00
Brad Hefta-Gaub
8ec3f7ea46
Merge pull request #5228 from DaveDubUK/walk-1.25
...
walk.js disable audio by default
2015-07-01 13:19:45 -07:00
Clément Brisset
52d1ae18cc
Merge pull request #5233 from SamGondelman/cameraMode
...
correct menu shortcut for mouselook
2015-07-01 11:15:31 -07:00
Seth Alves
33d9dc40f5
name stick
2015-06-29 16:08:50 -07:00
Seth Alves
2e5b25b5d8
include timescale in wire protocol ../../interface/src/avatar/AvatarActionHold.cpp
2015-06-29 14:34:26 -07:00
Sam Gondelman
0bf4c9dda2
correct menu shortcut for mouselook
2015-06-29 09:58:35 -07:00
Seth Alves
b19517ace7
make voxel editing work, even if the voxel-space is empty
2015-06-28 07:53:35 -07:00
Seth Alves
f2d8c78a88
make voxel editing work, even if the voxel-space is empty
2015-06-28 07:53:16 -07:00
Seth Alves
97cd5b8b99
Merge pull request #5223 from SamGondelman/cameraMode
...
misc. key binding/camera fixes
2015-06-27 10:55:34 -07:00
Seth Alves
7f609dca26
Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire
2015-06-27 10:49:12 -07:00
Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
DaveDubUK
bb2c640a6d
walk.js disable audio by default
2015-06-27 09:23:18 +07:00
Atlante45
7aae36d73e
Restore jquery
2015-06-26 17:58:53 -07:00
Sam Gondelman
2f0fcba1eb
key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode
2015-06-26 17:28:02 -07:00
Seth Alves
7def9c2e28
better handle failure to rez the stick
2015-06-26 17:10:50 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Howard Stearns
ce1e67b55a
Merge pull request #5179 from DaveDubUK/walk-1.25
...
walk.js version 1.25
2015-06-26 07:02:09 -07:00
Zander Otavka
803f644edf
Make hyperlink its own section in edit.js.
2015-06-25 11:40:09 -07:00
DaveDubUK
ce31e586b0
fixed sounds. fixed constants
2015-06-25 12:40:51 +07:00
DaveDubUK
ececf68f06
Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25
2015-06-25 12:15:07 +07:00
Brad Hefta-Gaub
6c4a4866d3
Merge pull request #5202 from Atlante45/overlay
...
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Niraj Venkat
d89ff2f720
Merge pull request #5188 from AlexanderOtavka/master
...
Improve address bar and edit.js entity properties list.
2015-06-24 16:48:24 -07:00
Atlante45
bc1abbe9b2
Update scripts
2015-06-24 16:45:38 -07:00
Brad Hefta-Gaub
0269e1eff1
Merge pull request #5204 from huffman/toolbar-titlebar
...
Add titlebar to toolbar and fix issue with draggable widgets not working (edit.js specifically)
2015-06-24 16:12:39 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Ryan Huffman
54ee869d9b
Fix y position of toolbar
2015-06-24 14:04:53 -07:00
Ryan Huffman
666eaa81fe
Cleanup implementation of toolbar titlebar
2015-06-24 14:02:06 -07:00
DaveDubUK
0e71583048
code review changes for walk.js 1.25
2015-06-24 19:41:54 +07:00
DaveDubUK
73e59fe07f
code review changes for walk.js 1.25
2015-06-24 19:25:25 +07:00
DaveDubUK
c2287e9953
code review changes for walk.js 1.25
2015-06-24 19:24:57 +07:00
Zander Otavka
8c77fd369b
Add subsections to the edit.js properties list.
2015-06-23 17:40:38 -07:00
Ryan Huffman
694a051724
Add titlebars to toolBars.js
2015-06-23 15:32:24 -07:00
Howard Stearns
5114f82dca
Fix https://app.asana.com/0/32622044445063/38213714069516
2015-06-23 12:07:01 -07:00
Seth Alves
4bf4e9f5da
Merge pull request #5164 from ericrius1/lineBounds
...
Line bounds
2015-06-23 10:47:38 -07:00
Philip Rosedale
1930043329
Merge pull request #5191 from ericrius1/gunFix
...
fixed bullet size to be smaller for gun.js script
2015-06-23 09:53:23 -07:00
ericrius1
cf579ab275
fixed bullet size to be smaller
2015-06-23 09:52:29 -07:00
Zander Otavka
f7cd756796
Improve entity properties list in edit script.
...
Add headers to break up logical sections, and reorder/relabel a few
properties.
2015-06-23 09:17:23 -07:00
ericrius1
9014e8c038
increased dimensions for line entity
2015-06-22 15:34:46 -07:00
Philip Rosedale
fd96c3a280
Merge pull request #5184 from ericrius1/utilities
...
Utilities
2015-06-22 12:14:17 -07:00
ericrius1
6c84e5ad77
actually syncing brush to line color
2015-06-22 11:08:40 -07:00
ericrius1
1b69563b29
changed quad back to line;
2015-06-22 11:06:40 -07:00
Howard Stearns
edf024dff8
Merge pull request #5178 from ctrlaltdavid/20584
...
CR for #20584 - Improve legibility of entities editor
2015-06-22 10:46:15 -07:00
ericrius1
362d9a2481
syncing brush sphere with line color
2015-06-22 10:35:00 -07:00
DaveDubUK
10d981e6d5
walk.js 1.25 comments removal
2015-06-22 17:51:49 +07:00
DaveDubUK
54608b9cb3
walk.js version 1.25
2015-06-22 14:18:07 +07:00
ericrius1
8fcff2d648
changed indent spacing to 4 spaces
2015-06-19 19:03:47 -07:00
ericrius1
18014e968d
removed horizontal "line break" style comment blocks
2015-06-19 19:00:42 -07:00
ericrius1
8bc9fc2e1f
simplified paint.js script to allow for faster iteration and more thorough testing
2015-06-19 18:58:09 -07:00
David Rowe
bdcf87a3c6
Improve legibility of entities editor
...
Increased font sizes.
Improved contrast between values and backgrounds.
2015-06-19 16:28:45 -07:00
Sam Gondelman
a0d4b7ec7c
without script, doesn't limit you to constant degree turns
2015-06-19 16:11:43 -07:00
Sam Gondelman
e78ce8055a
hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G
2015-06-19 11:17:36 -07:00
Ryan Huffman
1e69e647bb
Remove pointer.js from defaultScripts because it causes crashes
2015-06-19 11:02:00 -07:00
ericrius1
1eaf5ae82a
fixed utilities file to be able to be referenced by other files
2015-06-19 10:37:57 -07:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gondelman
9cfe8ecc01
added hmdControls.js to hmdDefaults.js
2015-06-18 18:59:10 -07:00
Sam Gondelman
decae5c1f1
finished hmdControls.js
2015-06-18 18:43:47 -07:00
ericrius1
7293330ced
fixed indentation and lines delete when user exits to help with large model.svo/json file size
2015-06-18 18:17:02 -07:00
ericrius1
830a8b6909
checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box
2015-06-18 18:14:03 -07:00
Brad Hefta-Gaub
750ce250fa
Merge pull request #5150 from SamGondelman/mouseLook
...
mouse look script
2015-06-18 17:41:20 -07:00
Sam Gondelman
012a508eb2
removed extraneous code
2015-06-18 16:25:12 -07:00
Sam Gondelman
c84a6cbf28
added warping
2015-06-18 16:05:58 -07:00
Sam Gondelman
fb7ddde0ca
removed magic numbers
2015-06-18 15:29:20 -07:00
Sam Gondelman
fd0efd91ff
added shift action, added timers and fast mode to hmdControls.js
2015-06-18 13:59:37 -07:00
Philip Rosedale
61a2196a30
Reduce error tolerances for ballistic prediction that trigger updating the server
2015-06-18 13:21:37 -07:00
Sam Gondelman
3baf6d80ae
removed magic numbers from mouseLook.js
2015-06-18 10:10:54 -07:00
Sam Gondelman
f752534f7c
actionEvent signal, captureActions, began work on hmdControls.js
2015-06-18 09:52:36 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
Sam Gondelman
a37b089b33
merge with master
2015-06-17 12:17:09 -07:00
Sam Gondelman
c0797313a1
added mouseLook.js to default scripts
2015-06-17 12:08:23 -07:00
Andrew Meadows
61f62f96b0
Merge pull request #5129 from SamGondelman/master
...
Integrating gamepads/hydras to input mapping system, zooming
2015-06-17 11:39:38 -07:00
Sam Gondelman
3af0c138dd
removed button image, extraneous variables
2015-06-17 11:39:11 -07:00
Sam Gondelman
17322645f2
added mouselook script, reticle and icons need changes
2015-06-17 11:17:38 -07:00
Seth Alves
f5cea57a48
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-06-17 07:20:15 -07:00
Philip Rosedale
7ead2bc46b
Merge pull request #5120 from ctrlaltdavid/20576
...
DO NOT MERGE - QA for #20576 - Play sound when mic is muted
2015-06-16 13:27:01 -07:00
Seth Alves
a5f7ba51b6
only show polyvox property widgets if we are editing a polyvox.
2015-06-16 10:13:47 -07:00
Sam Gondelman
40bd747080
added trigger buttons to hydra, removed hydraMove.js from default scripts
2015-06-15 11:13:07 -07:00
Philip Rosedale
0b4d4c24d4
Merge pull request #5119 from ericrius1/paintingOptimizations
...
added lifetime to painted lines to prevent huge model.json files when…
2015-06-14 21:47:56 -07:00
Philip Rosedale
c113b4620d
Merge pull request #5107 from howard-stearns/draggable-toolbar
...
Draggable toolbar
2015-06-14 21:46:49 -07:00
David Rowe
c369e305f8
Include dialTone.js in default scripts
2015-06-12 12:33:30 -07:00
David Rowe
f0b6b0f548
Play sound upon microphone being muted
2015-06-12 12:33:17 -07:00
David Rowe
546442ff9a
Fix sound URLs
...
Three slashes needed for Windows.
2015-06-12 12:32:40 -07:00
Eric Levin
7ee609396c
added lifetime to painted lines to prevent huge model.json files when lots of people draw in one domain. Got rid of gaps in lines when switching line entities
2015-06-12 11:58:43 -07:00
Howard Stearns
27f40ea881
Signal Audio.disconnected, and use new hello/goodbye sounds in resources.
2015-06-11 20:33:30 -07:00
Howard Stearns
3cb4ee183e
Update header.
2015-06-11 16:24:22 -07:00
Howard Stearns
e6bafb9bf1
Draggable toolBar.js, with persistence, and update some scripts for it.
2015-06-11 16:19:54 -07: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
Andrew Meadows
a3c5ea1b58
Merge pull request #5088 from sethalves/actions
...
spring action with rotation and position target, rework grab script to use it
2015-06-11 13:23:57 -07:00
Seth Alves
8ed9a3ca02
add handedness setting to avatar-hold action. update stick.js to allow use of hydra
2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub
a1ee339765
Merge pull request #5103 from samcake/punk
...
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
2015-06-11 10:17:38 -07:00
Andrew Meadows
f77f3f1e1e
fix bug where grab.js moves mouse to screen corner
...
when CTRL is pressed
2015-06-11 08:43:19 -07:00
Sam Gateau
7685fe2229
Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool
2015-06-11 06:40:21 -07:00
Philip Rosedale
b32994b359
Merge pull request #5083 from ctrlaltdavid/20551
...
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
2015-06-10 22:32:25 -07:00
Seth Alves
8bd80c511e
make stick follow mouse motion
2015-06-10 21:08:00 -07:00
Seth Alves
4216308b9b
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 19:05:25 -07:00
Seth Alves
45c7cd4929
respond to code review, add a simple hold-a-stick script
2015-06-10 18:48:51 -07:00
Niraj Venkat
9ed8daa97c
Removing unnecessary functions
2015-06-10 15:33:07 -07:00
Seth Alves
1c0c7f0fe3
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 15:30:28 -07:00
Niraj Venkat
182a3e918c
Hyperlink properties now propagate locally and over network
2015-06-10 13:12:18 -07:00
Niraj Venkat
c45d409383
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c
Working on creating functions to serialize and deserialize properties
2015-06-10 09:50:47 -07:00
Niraj Venkat
d90e43c5aa
Adding text boxes for hyperlink href and description
2015-06-09 16:15:47 -07:00
Stephen Birarda
091ed5b514
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-09 15:51:45 -07:00
Seth Alves
6cce845984
rotate based on initial mouse-position and initial entity rotation rather than doing small deltas as the mouse moves
2015-06-09 14:26:44 -07:00
Seth Alves
23dab530f9
fix some glitchy behavior during rotation
2015-06-09 14:11:01 -07:00
David Rowe
a4885ff38c
Close directory window after domain change
2015-06-09 12:33:30 -07:00
Seth Alves
ccb2f17b33
grab.js rotation sort-of works now
2015-06-09 11:21:13 -07:00
Seth Alves
42f94307d5
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-09 09:51:29 -07:00
Sam Gondelman
b1b2d1f85c
;) (added semicolons to js example)
2015-06-09 09:45:19 -07:00
David Rowe
cb6aef16e6
Merge branch 'master' into 20551
2015-06-09 09:36:44 -07:00
David Rowe
9e3ce344fb
Display directory button just above edit toobar
2015-06-09 07:26:18 -07:00
Brad Hefta-Gaub
3fb5e47dcc
Merge pull request #5064 from ericrius1/paint
...
bumped max line points to 80
2015-06-08 21:20:58 -07:00
Seth Alves
2fb64aad91
fix variable name
2015-06-08 20:31:35 -07:00
Seth Alves
14a45e8349
convert grab.js to use spring action. rotation doesn't work right, yet
2015-06-08 18:25:58 -07:00
Seth Alves
f491a7a786
Merge pull request #5084 from AndrewMeadows/inertia
...
rewrite grab.js to follow mouse
2015-06-08 17:35:03 -07:00
Brad Davis
90c18d0c48
Merge pull request #5080 from ZappoMan/team-teaching
...
Merge TEAM-TEACHING into MASTER
2015-06-08 17:34:42 -07:00
Andrew Meadows
b682a07714
merge upstream/master into andrew/inertia
...
Conflicts:
examples/grab.js
2015-06-08 17:28:14 -07:00
Andrew Meadows
ef1e3aae00
faster move and max solid angle for distant grabs
2015-06-08 16:59:33 -07:00
Andrew Meadows
ffeac220f9
fix typo in variable name
2015-06-08 16:40:50 -07:00
Andrew Meadows
e70cd9edd9
remove unused variable
2015-06-08 15:11:42 -07:00
Andrew Meadows
4647f84638
rewrite grab.js to follow mouse
2015-06-08 14:58:42 -07:00
Eric Levin
6d59518149
added meditative ocean landscape and common utilities file
2015-06-08 14:02:38 -07:00
ZappoMan
24c8e7d0e6
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-08 13:50:50 -07:00
ZappoMan
5d6112d9c5
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-08 12:29:32 -07:00
Stephen Birarda
4e755e304b
fix spacing in new JS file
2015-06-08 11:31:24 -07:00
Stephen Birarda
666830c04d
add a sound once first AM packet received
2015-06-08 11:30:12 -07:00
David Rowe
f51feca37d
Add directory button
2015-06-08 11:29:35 -07:00
Sam Gateau
de61f4ea0b
Gettting th ehighlight on transparent to work
2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0
shuffling the rendering steps to get to render transparent and light it correctly
2015-06-06 09:50:56 -07:00
Seth Alves
037a70b03a
undo unneeded/breaky change in grab.js
2015-06-05 13:47:07 -07:00
ZappoMan
7dc0e8a66c
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 12:21:29 -07:00
Eric Levin
21aa3b62bc
bumped max line points to 80
2015-06-05 12:04:32 -07:00
Seth Alves
b425cc6491
merge from upstream
2015-06-05 11:56:33 -07:00
Philip Rosedale
1f11625db4
Merge pull request #5060 from ericrius1/paint
...
moved ball marker closer to hand so painting feels more visceral
2015-06-05 11:26:22 -07:00
Seth Alves
4e10c28b41
merge from upstream
2015-06-05 10:31:13 -07:00
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
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
Howard Stearns
b79a58c0c8
Whitespace.
2015-05-13 18:07:51 -07:00
Brad Hefta-Gaub
072a982fe3
Merge pull request #4851 from huffman/fix-edit-properties-width
...
Remove nowrap from entity tool property labels
2015-05-13 17:45:57 -07:00
Howard Stearns
8324da2f7f
Whitespace formatting/indentation.
2015-05-13 15:48:22 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Brad Davis
9b6c20d93c
Merge remote-tracking branch 'upstream/master' into web-entity
2015-05-13 09:49:53 -07:00
Ryan Huffman
b4416f3bc2
Remove nowrap from entity tool property labels
2015-05-13 08:36:11 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
Philip Rosedale
107faf39c4
Merge pull request #4844 from huffman/color-picker-reduce-size
...
Make edit color picker slimmer
2015-05-12 16:35:09 -07:00
Seth Alves
4a533748f4
Merge pull request #4848 from PhilipRosedale/master
...
update position and rotation from the script, even though we should not have to
2015-05-12 16:13:29 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Brad Davis
745182a963
Working on web entities
2015-05-12 14:39:54 -07:00
Ryan Huffman
2e31cca7e5
Make edit color picker slimmer
2015-05-12 14:03:06 -07:00
Philip Rosedale
11ab97e0fc
update position and rotation from the script, even though we should not have to.
2015-05-12 13:11:11 -07:00
Thijs Wenker
77e5e7a547
random blockheight variation in Planky
2015-05-12 21:38:49 +02:00
Seth Alves
f647db3bf0
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-12 11:36:56 -07:00
Seth Alves
7a85bfa0d1
fix up grab.js to use line entity
2015-05-12 11:36:05 -07:00
Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
a32b4df6a5
Merge pull request #4841 from huffman/color-picker
...
Fix skybox color picker
2015-05-12 09:24:50 -07:00
Ryan Huffman
e673746d58
Fix skybox color picker
2015-05-12 09:22:53 -07:00
Brad Hefta-Gaub
9e308cce21
Merge pull request #4839 from huffman/color-picker
...
Add color picker to entity properties
2015-05-12 08:58:41 -07:00
Ryan Huffman
9f7e90d036
Add color picker to entity properties
2015-05-12 08:40:44 -07:00
Brad Hefta-Gaub
4d9e413b3f
Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements
...
Improvements to particle entity.
2015-05-12 08:40:11 -07:00
Clément Brisset
0bc12f40e6
Merge pull request #4834 from huffman/edit-draw-zone-boundaries
...
Remove old zone drawing
2015-05-12 14:29:42 +02:00
Clément Brisset
9bf4cf1262
Merge pull request #4830 from ZappoMan/moreZoneProperties
...
New Zone Features
2015-05-12 14:28:01 +02:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
Seth Alves
866a6fba9b
Merge pull request #4823 from birarda/master
...
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
Seth Alves
237eb72bec
if two people grab an enitity at once, don't forget about the original gravity
2015-05-11 16:01:50 -07:00
Ryan Huffman
24739d24e1
Fix calls to set draw zone boundaries
2015-05-11 15:23:39 -07:00
Ryan Huffman
6085aadbc7
Merge branch 'master' of github.com:highfidelity/hifi into edit-draw-zone-boundaries
...
Conflicts:
examples/libraries/zoneOverlayManager.js
2015-05-11 15:19:54 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
ZappoMan
28bacb4d82
add center in zone button to edit.js
2015-05-11 13:26:52 -07:00
Stephen Birarda
8c6715e4fc
resolve conflicts on merge with upstream/master
2015-05-11 11:10:22 -07:00
Clément Brisset
5160eb5b94
Merge pull request #4819 from ZappoMan/moreZoneProperties
...
More Zone Atmosphere Work: add automatic day/hour calculation
2015-05-11 19:38:27 +02:00
ZappoMan
4b8c6fc624
fix typo
2015-05-11 09:53:23 -07:00
Brad Hefta-Gaub
12269ff475
Merge pull request #4822 from Atlante45/edit_js
...
Hide/Show Skybox/Atmosphere props only when needed
2015-05-11 09:10:03 -07:00
Atlante45
beba293d96
Hide Skybox/Atmosphere prps when not needed
2015-05-11 15:54:30 +02:00
Atlante45
94765f0c53
Add print type
2015-05-11 15:54:14 +02:00
Anthony J. Thibault
ede42285b1
Improvements to particle entity.
...
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
2015-05-10 17:13:46 -07:00
ZappoMan
17c3c1a18d
add support for automatic hour/day calculations and backward compatibility on stage properties
2015-05-10 15:22:02 -07:00
Seth Alves
8da3490a4c
when grabbing an entity, zero out its gravity.
2015-05-10 09:32:03 -07:00
