Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-04 07:29:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

3386 commits

Author SHA1 Message Date
Seth Alves
cee296e70c keep object from rotating during local grab 2015-09-21 13:50:42 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
James B. Pollack
71e668470f Merge remote-tracking branch 'highfidelity/master' into flashlight_updates_1 2015-09-21 13:23:38 -07:00
ericrius1
b727256377 animation of doll plays longer now to give user a chance to see it play 2015-09-21 13:05:37 -07:00
ericrius1
d24df99445 Updated block logic to sync with desired behavior (each color block maps to a different size) 2015-09-21 11:51:00 -07:00
ericrius1
4e517b78e1 dice spawning higher so they fall onto craps table 2015-09-21 11:26:56 -07:00
ericrius1
30198aa6f2 Only play animation once for screaming doll when picked up 2015-09-21 11:22:35 -07:00
ericrius1
a71f1495e9 Lowered sound volume on doll, now choose between two screams 2015-09-21 11:15:40 -07:00
James B. Pollack
f3eef9322c Remove toybox reference in spawner script 2015-09-21 11:10:42 -07:00
James B. Pollack
c2a2abe615 Remove nested bubble entities and related code 2015-09-21 11:05:51 -07:00
David Rowe
52f6fe1d04 Clear entity list when you change domains 2015-09-21 09:59:00 -07:00
ericrius1
5cd69c4f03 Added dice to master reset script 2015-09-21 09:17:23 -07:00
Brad Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart 
Instanced rendering for Box entities
 2015-09-18 18:06:25 -07:00
Brad Hefta-Gaub
213cc25c75 Merge pull request #5856 from sethalves/hand-controller-adjustment 
fix releaseGrab in test script
 2015-09-18 17:52:12 -07:00
ericrius1
fb98960194 Adding wand to master script 2015-09-18 17:45:28 -07:00
Seth Alves
fd1c8f6389 fix releaseGrab in test script 2015-09-18 17:39:50 -07:00
ericrius1
b62807011c Doll screams and writhes when picked up, returns to default position when let go 2015-09-18 17:22:45 -07:00
Philip Rosedale
aebadb1ab9 Merge pull request #5854 from sethalves/hand-controller-adjustment 
tone down distance throwing
 2015-09-18 17:20:22 -07:00
ericrius1
de14fc64f6 screaming on grab. Need to get release working 2015-09-18 17:17:55 -07:00
Seth Alves
cfde86a7ea tone down distance throwing 2015-09-18 17:07:10 -07:00
David Rowe
60ba6e174f Typo 2015-09-18 16:44:20 -07:00
David Rowe
812ab9b7c6 Merge branch 'master' into 20681 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-09-18 16:44:04 -07:00
Philip Rosedale
bbc1c551eb Merge pull request #5853 from sethalves/hand-controller-adjustment 
fix when releaseGrab is called
 2015-09-18 16:30:01 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Seth Alves
236831d385 fix when releaseGrab is called 2015-09-18 16:28:15 -07:00
Philip Rosedale
928a74a306 Merge pull request #5852 from sethalves/hand-controller-adjustment 
Hand controller adjustment
 2015-09-18 16:21:12 -07:00
Seth Alves
5db3af3f4c formatting 2015-09-18 15:58:47 -07:00
Seth Alves
5367de35c1 fix distance-grab throwing 2015-09-18 15:45:36 -07:00
James B. Pollack
ccf125c047 Cleanup comments 2015-09-18 15:40:39 -07:00
James B. Pollack
c364189bc8 Update file header 2015-09-18 15:26:34 -07:00
James B. Pollack
dc17985e29 Add some logic for turning off the flashlight when squeeze trigger pressure is low, and turning it back on when squeeze pressure goes over certain amount 2015-09-18 15:24:44 -07:00
Eric Levin
35e38a443c Merge pull request #5849 from sethalves/hand-controller-adjustment 
Hand controller adjustment
 2015-09-18 15:22:29 -07:00
Andrew Meadows
269e3d7f23 Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance 
Entities.getEntityProperty() performance improvements
 2015-09-18 15:19:06 -07:00
Seth Alves
3d18edd9d1 update detectGrabExample.js 2015-09-18 15:13:09 -07:00
Seth Alves
612e906a44 change the names of entityMethods which the grab script will call. adjust the release velocity multiplier 2015-09-18 15:09:05 -07:00
Seth Alves
d1a7aca7f0 add continue-distance-holding state. don't call callEntityMethod unless action creation works. increase distance-holding multiplier. 2015-09-18 14:45:49 -07:00
ericrius1
dd3f1301e6 Blocks are now multi colored 2015-09-18 14:36:41 -07:00
James B. Pollack
a897c17eb2 Remove grab-frame and reset position code 2015-09-18 14:31:40 -07:00
James B. Pollack
031761fa57 added some logging while things were broken 2015-09-18 14:27:57 -07:00
Seth Alves
c5716b715d merge from upstream 2015-09-18 14:22:11 -07:00
Seth Alves
7a8cee4cc3 fix release velocity so throwing things works reliably 2015-09-18 14:13:08 -07:00
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -07:00
ericrius1
86dfa6f590 2 sizes for blocks 2015-09-18 12:35:49 -07:00
David Rowe
03194437f5 Merge branch 'master' into 20681 
Conflicts:
	examples/entityScripts/sprayPaintCan.js
 2015-09-18 12:04:02 -07:00
David Rowe
68874eed96 Update particle scripts 2015-09-18 11:34:26 -07:00
ericrius1
8ada3dec6e Adding doll in 2015-09-18 11:29:16 -07:00
Seiji Emery
e723a5c0fd whitespace + "waiting for entity server" 
No functionality changes, but now prints "waiting for entity server"
once if waiting for more than X seconds in startup().
 2015-09-18 11:18:33 -07:00
Seiji Emery
c25d8857d9 Merge branch 'master' of https://github.com/highfidelity/hifi into platform-js 2015-09-18 11:14:49 -07:00
ericrius1
65722dc870 Removed master spawner as its no longer needed 2015-09-18 11:01:33 -07:00
ericrius1
6e4b838bf9 added collision sound to bbal 2015-09-18 10:59:28 -07:00
ericrius1
d6377ee6bb Added basketball to master reset script 2015-09-18 10:55:29 -07:00
James B. Pollack
15ea9219d6 collision timeouts 2015-09-18 10:41:44 -07:00
James B. Pollack
9a3a87eedf improve velocity calculations for wand 2015-09-18 10:03:21 -07:00
Seth Alves
b08f567999 put controller specific functions inside the controller object 2015-09-18 09:56:45 -07:00
Seth Alves
b8c8ea2b53 move magic numbers to constant variables, add some comments 2015-09-18 07:20:35 -07:00
David Rowe
8634b59914 Make able to emit from within portion of ellipsoid volume 2015-09-17 23:49:57 -07:00
Seth Alves
6d7b129b83 rework handControllerGrab.js 2015-09-17 23:15:18 -07:00
David Rowe
9e2b5b75b6 Make able to emit in specified range of directions 
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
 2015-09-17 22:40:49 -07:00
James B. Pollack
8a7798fcd7 disable bubble particle burst until i know the right for an entity to watch and see if it is deleted. 2015-09-17 22:00:44 -07:00
Brad Hefta-Gaub
0811da14b8 use new feature for getEntityUserData 2015-09-17 21:14:07 -07:00
David Rowe
f647dcf147 Change emitter radiuses to dimensions to match sphere properties 2015-09-17 21:06:40 -07:00
James B. Pollack
5ac084ad4f Randomize bubble gravity, code cleanup 2015-09-17 20:57:07 -07:00
ericrius1
ae795a5c4f spray paint spawner working 2015-09-17 17:15:59 -07:00
David Rowe
12e2cf3ce9 Emit in all directions from a point or the surface of a spheroid 2015-09-17 17:14:35 -07:00
ericrius1
78642e3c79 Getting rid of managers 2015-09-17 17:04:09 -07:00
ericrius1
5f12a5c85a Merge branch 'master' into toybox 2015-09-17 16:13:10 -07:00
ericrius1
9614a69b19 adding spray can 2015-09-17 16:12:16 -07:00
James B. Pollack
df0b9e7dbb refactor bubble wand to prevent duplicate bubbles 2015-09-17 15:59:19 -07:00
ericrius1
109f2d8a1a base positions 2015-09-17 15:39:31 -07:00
ericrius1
75c1e49567 more tweaks 
yeah
 2015-09-17 15:32:40 -07:00
ericrius1
cdae5452ce going ac script route for entity reset 2015-09-17 14:21:11 -07:00
Brad Hefta-Gaub
5549f4ec40 Merge pull request #5821 from ericrius1/paintCan 
Paint can tweaks
 2015-09-17 11:37:44 -07:00
ericrius1
c5b7de2156 added fire spawner 2015-09-17 10:00:01 -07:00
ericrius1
7ffcce589d blocks spawning 2015-09-17 09:09:25 -07:00
ericrius1
b9985031da adding blocks 2015-09-17 09:03:42 -07:00
James B. Pollack
75df4e96e8 cleanup 2015-09-16 18:48:06 -07:00
James B. Pollack
a8fe3b3edd keep the bubble with the wand, make the wand smaller 2015-09-16 18:08:56 -07:00
James B. Pollack
9aa2067e3e cleanup unused reset stuff 2015-09-16 17:26:18 -07:00
James B. Pollack
e1e567b1b5 remove mouth mode 2015-09-16 17:09:54 -07:00
James B. Pollack
3e7cc7d6eb remove sounds from bubble 2015-09-16 17:02:52 -07:00
James B. Pollack
5ab8f19257 fix merge leftovers 2015-09-16 16:42:23 -07:00
James B. Pollack
c2d5483da6 Merge branch 'bubblewand_hotfix_2' of https://github.com/imgntn/hifi into bubblewand_hotfix_2 2015-09-16 16:32:23 -07:00
James B. Pollack
455ed27c2b pre-test with eric 2015-09-16 16:26:09 -07:00
David Rowe
d51cab3e3d Replace particle velocity with speed and orientation 2015-09-16 14:51:08 -07:00
ericrius1
bbf6e8b599 using relative paths for entity scripts 2015-09-16 13:52:29 -07:00
ericrius1
0b21cc1777 paint can tweaks 2015-09-16 09:59:35 -07:00
BOB LONG
efc321bc10 Display face blend coefficients 
Display the face blend coefficients and update the value in real time.
 2015-09-16 00:40:26 -07:00
James Pollack
37f45b57ff wand updates 2015-09-15 18:40:54 -07:00
Seth Alves
f7193dbb97 if the intersection distance is small, use grab-mode rather than distant-grab-mode 2015-09-15 16:55:51 -07:00
ericrius1
da208526cc spray can tweaks 2015-09-15 16:48:28 -07:00
ericrius1
9648f56062 some fixups to spray paint script 2015-09-15 15:48:21 -07:00
Seth Alves
e650e40388 try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection 2015-09-15 11:32:56 -07:00
Seth Alves
7b5d6c20e9 double change in hand rotation before applying it to the object 2015-09-15 11:21:13 -07:00
Seth Alves
99b0046fc7 various adjustments 2015-09-15 10:43:17 -07:00
Seth Alves
d874c9b382 snip out tractor beam 2015-09-14 14:20:49 -07:00
Seth Alves
f4aad05621 reduce radius of hand-intersects-object test. fix lifetime of laser line 2015-09-14 14:07:16 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Seth Alves
f51f17b267 Merge pull request #5775 from ericrius1/paintCan 
Paint can
 2015-09-11 12:34:44 -07:00
ericrius1
0a46db60ac spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles 2015-09-11 12:01:01 -07:00
ericrius1
eabdd1f4d9 quick fix for particles hanging around 2015-09-11 11:33:21 -07:00
ericrius1
6e46e3d3b6 cleanup for paintcan 2015-09-11 11:24:53 -07:00
ericrius1
1991ba0eba absolute path for now- just for testing purposes before merge 2015-09-11 09:37:03 -07:00
Brad Davis
92eeb564fe PR comments 2015-09-10 20:57:43 -07:00
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
James Pollack
c3ed2d9064 fix file paths 2015-09-10 17:10:55 -07:00
ericrius1
7969fb64ce tweaking distance threshold 2015-09-10 17:08:52 -07:00
James Pollack
1cec61ebba fire particles before burst sound 2015-09-10 17:05:24 -07:00
Seth Alves
94dc86833f Revert "edit.js adjustment" 2015-09-10 17:01:11 -07:00
James Pollack
387e7b74a9 Return wand to its original position if it hasnt moved for 5 seconds, better particles, wand scaled to human size 2015-09-10 16:58:39 -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
James Pollack
ee7e25a137 remove localhost refs 2015-09-10 11:49:12 -07:00
James Pollack
5df483b35f ignore 0,0,0 positions so we have accurate unload for bubbles 2015-09-10 11:32:21 -07:00
James Pollack
dfa43e84bf bubble update hook 2015-09-10 10:31:17 -07:00
James Pollack
8f77c0b61c Update wand to use relative paths, remove some unused position tracking methods, remove cache busting from model file paths 2015-09-10 09:58:31 -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
James Pollack
da90b7ff08 remove logging around bubble leave entity 2015-09-09 09:53:47 -07:00
James Pollack
0ac4da285c Update bubblewand to not use overlays by default. 2015-09-09 09:48:39 -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
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
Seiji Emery
d9ea2ae27b Fixed sliders 2015-08-28 15:43:55 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Seiji Emery
202f68be58 Fixed sphere entities + renamed user settings 2015-08-28 11:38:59 -07:00
Seiji Emery
c12f192c3a bugfix... 
Apparently I didn't test that -_-
 2015-08-27 21:44:55 -07:00
Seiji Emery
2bea436e12 Added timeouts 
if USE_ENTITY_TIMEOUTS is enabled, entities will now clean up after
themselves if not touched within X seconds (ie. if the script and/or
client crashes and scriptEnding isn't called then the entities will
timeout; otherwise, they get cleaned up normally when the script ends).
 2015-08-27 18:34: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
Seiji Emery
6583ea1791 Reverted default entity type back to spheres 2015-08-27 13:08:19 -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
Seiji Emery
fbf6d0efe8 Added failsafe so dependencies don't break 2015-08-27 11:57:53 -07:00
Seiji Emery
62a6a9d45e Description 2015-08-27 11:54:47 -07:00
Seiji Emery
d57c7de316 Added rebuild + toggle entity type 2015-08-27 11:51:36 -07:00
David Rowe
a553022adf Update entities list as search radius value is changed 2015-08-27 11:11:05 -07:00