Brad Hefta-Gaub
fe90af0e07
Merge pull request #5737 from ericrius1/grabChanges
...
hydraGrab is now called handControllerGrab.js now grabs entities based on how they want to be grabbed (th…
2015-09-08 15:59:28 -07:00
ericrius1
572b120bf0
removed print statements
2015-09-08 15:57:31 -07:00
Brad Hefta-Gaub
8185a8da7f
Merge pull request #5732 from jherico/selma
...
Procedural skyboxes
2015-09-08 15:12:59 -07:00
Brad Hefta-Gaub
a6395e9438
add a boom box entity script
2015-09-08 14:54:22 -07:00
Eric Levin
69612551e2
Merge pull request #5739 from ctrlaltdavid/20669
...
CR for 20669 - Add additional particle properties controlling size, colour, and opacity
2015-09-08 14:51:54 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
James B. Pollack
4d907aa53b
Merge pull request #5726 from SeijiEmery/jsbenchmarks
...
Javascript benchmarking
2015-09-08 14:24:30 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
Brad Hefta-Gaub
57c27f7049
added an example script that detects being touched by avatars hand
2015-09-08 13:06:20 -07:00
ericrius1
7133fc94f5
hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey
2015-09-08 12:54:02 -07:00
Brad Hefta-Gaub
781f19c9e3
position the puppet on level of nearby table
2015-09-08 12:27:24 -07:00
David Rowe
cdd5e68815
Add colorStart and colorFinish entity particle properties
2015-09-08 11:28:53 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
Brad Hefta-Gaub
ebeedb5cde
work on moving dancers to center of table if it's present
2015-09-05 22:05:53 -07:00
David Rowe
47b27a3280
Add alphaStart and alphaFinish entity particle properties
2015-09-05 16:30:01 -07:00
David Rowe
1b3d125cb3
Add alphaSpread entity particle property
2015-09-05 14:39:10 -07:00
Brad Hefta-Gaub
1df3a8f814
Merge pull request #5727 from jherico/marge
...
Procedural rendering for box & sphere entities
2015-09-05 12:43:21 -07:00
Brad Davis
d8e5945d14
Removing procedural edit work in progress for now
2015-09-05 12:17:36 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
Brad Hefta-Gaub
50e6d2f769
Merge pull request #5712 from highfidelity/bubblewand
...
wand.js + bubble.js = bubblewand
2015-09-04 20:07:22 -07:00
Brad Hefta-Gaub
7b4e69a92d
Merge pull request #5698 from Nex-Pro/20657
...
CR for Job #20657 - Entities list trouble past 100 entities
2015-09-04 20:06:33 -07:00
Seiji Emery
68a4f4ac5e
Added js benchmark scripts
...
Adds a small declarative benchmarking library and some sample tests to
examples/utils/tests.
2015-09-04 17:36:09 -07:00
Brad Hefta-Gaub
10585a1b30
have breakdance entity script use the model and location of the entity
2015-09-04 16:20:12 -07:00
James Pollack
5684e13400
updates for cleaner PR
2015-09-04 15:49:12 -07:00
David Rowe
e86581ab64
Update scripts to use HiFi smoke particle
2015-09-04 13:51:25 -07:00
David Rowe
18bc7befee
Merge branch 'master' into 20669
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-09-04 13:49:46 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
Seth Alves
7d2bdb3689
Merge pull request #5719 from ericrius1/spraypaint
...
added spraypaint-can entity script
2015-09-04 11:27:52 -07:00
ericrius1
f48cfa1208
added spawner script for spray paint toy
2015-09-04 10:36:14 -07:00
Andrew Meadows
5d40517edd
Merge pull request #5706 from sethalves/polyvox-again
...
Polyvox improvements
2015-09-04 10:32:36 -07:00
ericrius1
878d42a8d0
added spraypaint can entity script
2015-09-04 10:30:12 -07:00
Brad Hefta-Gaub
143376f501
Merge pull request #5718 from jherico/homer
...
Magballs: Cleaning up some debugging spew and fixing UI HTML paths
2015-09-04 10:01:01 -07:00
Brad Davis
80f2ecbab6
Cleaning up some debugging spew and fixing UI HTML paths
2015-09-04 09:59:42 -07:00
Brad Davis
3573fe8d11
Merge pull request #5717 from ZappoMan/breakDanceEntityScript
...
add breakdance game as entity script that works with hydra grab
2015-09-04 09:49:54 -07:00
Brad Hefta-Gaub
895028134b
add breakdance game as entity script that works with hydra grab
2015-09-04 09:40:09 -07:00
Seth Alves
72322c0270
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-04 09:12:32 -07:00
James B. Pollack
a9ad18ec80
cleanup, comments, and consolidation.
2015-09-03 20:42:56 -07:00
Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
James Pollack
1e9bac8dee
add create wand script, add offset to bubble spawn point so that it is at the end of the wand
2015-09-03 17:42:41 -07:00
James Pollack
cf0d236174
silence logging statements for now
2015-09-03 16:50:37 -07:00
James Pollack
80c18c227e
Attach the wand.js script to an entity and then move it around to make bubbles. Customize bubble behavior with bubble.js - make sure to update the path reference in wand.js
2015-09-03 16:42:14 -07:00
Seth Alves
e12b7807ad
merge from upstream
2015-09-03 16:36:04 -07:00
David Rowe
341e1dcf68
Add particleTest.js script to demo / test entity particle properties
2015-09-03 14:55:09 -07:00
Brad Davis
a8b5336e02
Merge pull request #5709 from ZappoMan/breakdanceToy
...
next wave of breakdance work
2015-09-03 14:55:04 -07:00
Brad Hefta-Gaub
44c554895d
next wave of breakdance work
2015-09-03 14:33:25 -07:00
ericrius1
ebe5818c84
relative path
2015-09-03 14:09:01 -07:00
ericrius1
fa42334430
added userData manipulations to grab script
2015-09-03 11:30:44 -07:00
Seth Alves
07b241c778
code review
2015-09-03 11:05:44 -07:00
Seth Alves
bb96ad1346
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-03 09:38:58 -07:00
Brad Hefta-Gaub
e6f43d3dd7
Merge pull request #5702 from ericrius1/newGrab
...
update hydra grab to grab near and far objects, and removed grabbing…
2015-09-02 18:43:41 -07:00
Brad Davis
5717b77837
Updating magballs to omnitool
2015-09-02 18:14:21 -07:00
Brad Davis
ea415071b4
OmniTool first pass
2015-09-02 18:14:13 -07:00
ericrius1
d303c7e119
only add actions to physical objects
2015-09-02 16:45:50 -07:00
Seth Alves
2e880e9aab
change how pick-ray direction is calculated
2015-09-02 16:29:15 -07:00
Brad Davis
849249d7fe
Fixing colors
...
Conflicts:
examples/toys/magBalls/handController.js
2015-09-02 15:56:38 -07:00
ericrius1
1e6198cf59
update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js
2015-09-02 11:29:37 -07:00
Seth Alves
f54d924f4a
make sure intersected entity is in the list of possible polyvoxes to adjust
2015-09-02 09:29:51 -07:00
Seth Alves
3963035599
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-01 21:08:23 -07:00
Seth Alves
8608e4f2b0
small bug-fixes
2015-09-01 16:51:55 -07:00
Seth Alves
4ab8ac29b9
make terrain a doubly linked list
2015-09-01 15:23:47 -07:00
Ryan Downe Karpf
f0d69b1cdd
Merge pull request #5665 from ctrlaltdavid/20664
...
Add search radius field to entities list
2015-09-01 14:39:53 -07:00
Seth Alves
ca1602e443
if avatar is already standing on a terrain-polyvox, try creating a new one where they are facing
2015-09-01 11:09:46 -07:00
Seth Alves
0dfe6e8054
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-01 09:13:43 -07:00
Seth Alves
4cbfe96b70
allow a sphere set/clear to affect more than one polyvox at a time
2015-08-31 18:16:32 -07:00
Seth Alves
6096c20db0
allow adding and deleting spheres
2015-08-31 18:00:31 -07:00
David Rowe
e2ee074b7a
Entity search uses radius, not diameter
2015-08-31 13:51:03 -07:00
Andrew Meadows
5a67865d74
Merge pull request #5679 from jherico/apu
...
Magnetic sticks and balls, rough draft
2015-08-31 13:17:29 -07:00
Andrew Meadows
de6afb4d74
Merge pull request #5660 from sethalves/polyvox
...
Polyvox improvements
2015-08-31 13:14:01 -07:00
Seth Alves
3424071a33
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-08-31 11:17:46 -07:00
Brad Davis
dc7d20ff86
Working on ui
2015-08-30 23:50:02 -07:00
Brad Davis
9d07bf1585
Magballs: Removing entity scripts, using onUpdate
2015-08-30 19:20:47 -07:00
Seth Alves
41a2ff2fff
working on stitching marching-cube polyvoxs together
2015-08-30 18:42:15 -07:00
Brad Davis
a574251173
Cleaning up and moving entity script
2015-08-29 23:06:23 -07:00
Brad Davis
cffb0be384
Removing edge finding calculations
2015-08-29 22:49:14 -07:00
Brad Davis
ebb530aaac
More magball work
2015-08-29 22:30:21 -07:00
Brad Davis
38b62108af
Magnetic sticks and balls
2015-08-28 23:35:43 -07:00
James B. Pollack
08986dcb17
Merge pull request #5669 from ZappoMan/breakdanceToy
...
first cut at breakdance toy
2015-08-28 16:36:00 -07:00
Seth Alves
752c787f0b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-28 12:50:31 -07:00
Nex Pro
b2e5cc7c4e
Fixed list problems when list contains more than 200 entries. And some style fixes.
2015-08-28 02:29:01 +01:00
Brad Hefta-Gaub
542b124146
first cut at breakdance toy
2015-08-27 16:12:33 -07:00
David Rowe
c9d799f5e0
Auto refresh entities list upon display of Entities tab
2015-08-27 13:32:00 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
David Rowe
0399c5ca35
Merge branch 'master' into 20664
2015-08-27 12:13:15 -07:00
David Rowe
005851a74a
Increase default entity search radius to 100m
2015-08-27 12:13:04 -07:00
David Rowe
a553022adf
Update entities list as search radius value is changed
2015-08-27 11:11:05 -07:00
David Rowe
d628a88f52
Fix some invalid HTML
2015-08-27 11:10:20 -07:00
David Rowe
1880b263d4
Add entity search radius field to entities list
2015-08-27 11:09:55 -07:00
Brad Hefta-Gaub
7b2f944f48
Merge pull request #5561 from ericrius1/particleExtensions
...
Extended Particle entity to allow for more varied effects
2015-08-27 10:45:03 -07:00
Seth Alves
b09de4ff65
fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there.
2015-08-26 21:51:28 -07:00
Seth Alves
6f46832069
clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct
2015-08-25 21:30:38 -07:00
Seth Alves
405c9828b8
cargo-cult a voxel-editor tool-bar from edit.js
2015-08-25 16:41:38 -07:00
Seth Alves
d2cfca0424
fix comment typo
2015-08-25 16:41:10 -07:00
Seth Alves
91254245e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-24 20:21:24 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
ericrius1
13892db866
removed logging
2015-08-24 11:41:03 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Thijs Wenker
67e945b884
fix unit test
2015-08-22 03:32:53 +02:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
