Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d
Fixing some entity race condition crashes
2015-09-10 20:43:41 -07:00
ericrius1
7969fb64ce
tweaking distance threshold
2015-09-10 17:08:52 -07:00
Seth Alves
94dc86833f
Revert "edit.js adjustment"
2015-09-10 17:01:11 -07:00
ericrius1
a1fd867c09
timer fix for reset
2015-09-10 16:46:25 -07:00
ericrius1
510e253575
switching to hosted script for testing
2015-09-10 16:26:57 -07:00
ericrius1
66e4acf651
trying to move to instant reset
2015-09-10 16:21:57 -07:00
Sam Gateau
ae03d32a84
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-09-10 15:55:42 -07:00
Sam Gateau
3bf0f388eb
Make the flashlight grab frame work correctly
2015-09-10 15:39:54 -07:00
Philip Rosedale
5955228652
Merge pull request #5769 from sethalves/edit-js-adjustment
...
edit.js adjustment
2015-09-10 15:36:35 -07:00
Philip Rosedale
93261976c0
Merge pull request #5763 from hyperlogic/tony/squeeze-hands-improvements
...
Improvements to squeezeHands.js
2015-09-10 15:34:52 -07:00
Sam Gateau
d0592d562c
Make the flashlight grab frame work correctly
2015-09-10 15:30:50 -07:00
Seth Alves
698ccc6fb0
don't change camera when edit.js is activated. don't highlight entites I mouse-hover over.
2015-09-10 13:48:36 -07:00
Sam Gateau
38fcb80135
FIx bad relative path
2015-09-10 09:52:52 -07:00
Howard Stearns
d7c1c7593a
Merge pull request #5761 from ZappoMan/preventIncludeRecusion
...
prevent Script.include() from including the same file multiple times
2015-09-10 09:22:55 -07:00
Brad Hefta-Gaub
1aa3c746a6
Merge pull request #5762 from samcake/punk
...
Adding the flashlight toy script
2015-09-10 09:15:22 -07:00
Brad Hefta-Gaub
edf889a4c8
Merge pull request #5756 from ericrius1/grabChanges
...
added lifetime to pointer, default grab behavior now honors objects i…
2015-09-10 09:14:11 -07:00
Brad Hefta-Gaub
f45e182d33
fix CR feedback, add examples
2015-09-10 09:06:56 -07:00
ericrius1
66a4ff752c
cleaning up lifetime calc
2015-09-10 09:01:51 -07:00
ericrius1
9ba681dd7f
fixed way lifetime on pointer entity is updated
2015-09-10 08:59:05 -07:00
samcake
e647bfc19b
Update flashlight.js
...
modify the path to be relative
2015-09-09 22:41:09 -07:00
Anthony J. Thibault
839047e583
Improvements to squeezeHands.js
...
* Account for controller dead spot. This helps us to see first few frames of the opening animation
and the last few frames of the closing animation
* Added a small amount of smoothing on the triggers
* Fixed bug when controllers were closed quickly and the animation frame was never getting set,
because frame and lastFrame were equal.
* Changed animation urls to Ozan's latest.
2015-09-09 21:46:35 -07:00
Sam Gateau
0a0a9805f6
Fixing the url behavior
2015-09-09 18:11:00 -07:00
Sam Gateau
8360fceadf
Fixing the url behavior
2015-09-09 18:09:52 -07:00
Sam Gateau
6aebda86f4
Creating the flashlight script files
2015-09-09 17:24:20 -07:00
Brad Hefta-Gaub
0023016447
Merge pull request #5757 from ZappoMan/breakdanceToy
...
added some debugging to breakdance toy
2015-09-09 14:56:08 -07:00
Brad Hefta-Gaub
62bf6c7c6f
added some debugging to breakdance toy
2015-09-09 14:55:39 -07:00
Brad Hefta-Gaub
ec93fc1b05
added some debugging to breakdance toy
2015-09-09 14:24:52 -07:00
ericrius1
5025030726
added lifetime to pointer, default grab behavior now honors objects initial position and rotation
2015-09-09 14:24:30 -07:00
Brad Hefta-Gaub
6866c288b0
Merge pull request #5754 from ZappoMan/breakdanceToy
...
fix breakdance toy
2015-09-09 12:42:10 -07:00
Brad Hefta-Gaub
427ed8807b
fix breakdance toy
2015-09-09 12:41:59 -07:00
Ryan Downe Karpf
9c71d5fd4d
Merge pull request #5750 from ZappoMan/boombox
...
lower volume
2015-09-09 09:30:29 -07:00
Brad Hefta-Gaub
b0329a58a6
lower volume
2015-09-09 09:29:31 -07:00
Brad Davis
75a05ff15d
Reduce logging spam in omniTools/magBalls
2015-09-08 20:56:54 -07:00
Brad Hefta-Gaub
ae8c3a19ed
Merge pull request #5746 from imgntn/bubblewand_hotfix_1
...
Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)
2015-09-08 18:18:36 -07:00
Brad Hefta-Gaub
ece8addf81
fix issue with default scripts
2015-09-08 18:08:30 -07:00
James Pollack
66b6d5178f
Cleanup wand when createWand.js script ends
2015-09-08 17:25:39 -07:00
Brad Hefta-Gaub
0612ee498d
Merge pull request #5742 from ericrius1/defaultGrab
...
handControllerGrab.js is active by default
2015-09-08 16:49:03 -07:00
Brad Davis
ec566a63fc
Merge pull request #5736 from ZappoMan/breakdanceToy
...
Breakdance Toy - better positioning on puppet
2015-09-08 16:29:29 -07:00
Eric Levin
e9ea42f9ad
Merge pull request #5740 from ZappoMan/boombox
...
add a boom box entity script
2015-09-08 16:16:41 -07:00
ericrius1
717cbf3d5b
handControllerGrab.js is active by default
2015-09-08 16:13:17 -07:00
Brad Hefta-Gaub
ca6c413221
tweak THE_SONG
2015-09-08 16:02:10 -07:00
Brad Hefta-Gaub
8c4d7b98fd
fix header comment
2015-09-08 16:01:07 -07:00
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
