Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32793 commits 76 branches 59 tags 1.2 GiB
Commit graph

3531 commits

Author SHA1 Message Date
ericrius1
1b096d1573 Merge branch 'master' into toybox 2015-09-28 09:31:49 -07:00
ericrius1
bab3c6fcf2 adjust lastFrame 2015-09-28 09:31:11 -07:00
Brad Hefta-Gaub
3e758f3c6b fix Triangle::getNormal, add normal display to rayPickExample 2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6 normalize the surface normal from the triangle, coding standard fix, update example 2015-09-28 08:30:49 -07:00
James B. Pollack
fff8bbf104 add some vec3 folders to generics 2015-09-27 15:53:18 -07:00
James B. Pollack
b70a7a705c make vec3folder abstract 2015-09-27 15:03:37 -07:00
James B. Pollack
46dbf45e07 add custom dat.gui build with basic array support, add vec3 support client side (only one-way at the moment) as folder example 2015-09-27 14:45:42 -07:00
James B. Pollack
6e00070b5e working 2 way generics 2015-09-27 11:48:52 -07:00
James B. Pollack
e029ee2a57 working two-way generic with visibility toggle as example 2015-09-27 10:44:52 -07:00
James B. Pollack
88d6af3914 improve generic implementation 2015-09-27 10:18:59 -07:00
James B. Pollack
c824d569e0 change generic box spawn position 2015-09-26 23:41:28 -07:00
James B. Pollack
c60701d49a headers 2015-09-26 23:27:24 -07:00
James B. Pollack
4f7e7e1d5f start generic two-way implementation, fix some typos 2015-09-26 23:24:00 -07:00
James B. Pollack
06a6462636 add function for manually updating display 2015-09-26 14:14:21 -07:00
James B. Pollack
7a59a7dc43 add two-way code but dont enable 2015-09-26 14:10:30 -07:00
James B. Pollack
5013e98b6c cleanup, comments 2015-09-26 12:47:22 -07:00
James B. Pollack
22515a9375 fix naming, match initial properties 2015-09-26 12:40:46 -07:00
James B. Pollack
51de351c50 convert tabs to spaces 2015-09-26 12:28:15 -07:00
James B. Pollack
f953456007 comments 2015-09-26 12:21:55 -07:00
James B. Pollack
f3c13f5d69 do grouping differently so names look better 2015-09-26 12:18:20 -07:00
James B. Pollack
f84762f2d7 remove old gui file 2015-09-26 12:02:59 -07:00
James B. Pollack
46fabf964d cleanup 2015-09-26 11:54:57 -07:00
James B. Pollack
a0b3bd91a3 cleanup logging 2015-09-26 11:40:31 -07:00
James B. Pollack
d8e7cd89ad Cleanup, comments 2015-09-26 11:27:58 -07:00
James B. Pollack
57aca0c418 New way to do two-way bindings between dynamically created GUI and in-world object properties. Uses partcile system properties, specifically. 2015-09-26 11:18:22 -07:00
James B. Pollack
b254353b38 Update collectHifiStats.js 
Clears the current batch after we send it to the endpoint.
 2015-09-26 07:09:41 -07:00
James Pollack
8f25e54027 Hoop, ball, ground 2015-09-25 18:34:34 -07:00
ericrius1
bcd2171491 updated chair model 2015-09-25 16:28:12 -07:00
ericrius1
534cffcf85 fixed animation bug with doll 2015-09-25 16:23:35 -07:00
ericrius1
e94d9b39fd made pots and chair not grabbable 2015-09-25 15:42:13 -07:00
James Pollack
1f7914766c Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false 2015-09-25 15:26:29 -07:00
James Pollack
2c0c2a0979 Merge remote-tracking branch 'upstream/master' into thoys-20672 2015-09-25 14:49:31 -07:00
ericrius1
c53ad3c534 combined arm chair 2015-09-25 12:34:35 -07:00
ericrius1
f5e44675bb removed start and end frame 2015-09-25 12:11:22 -07:00
ericrius1
65169da64d removed old doll script 2015-09-25 11:58:05 -07:00
ericrius1
9227676275 Merge branch 'master' into toybox 2015-09-25 11:50:34 -07:00
ericrius1
ccc6a343fc updated lights to use newly named grab events 2015-09-25 11:49:51 -07:00
ericrius1
7789d8b3a8 fixed potted plant bug 2015-09-25 11:37:04 -07:00
ericrius1
d29c337e95 moved light switches up 2015-09-25 11:32:41 -07:00
ericrius1
a629701362 couch 2015-09-25 11:15:19 -07:00
ericrius1
f4007584e1 formatted master script 2015-09-25 11:02:41 -07:00
ericrius1
0815b8e939 Added polar finish to spray paint stream 2015-09-25 10:59:20 -07:00
James Pollack
1051416ed7 Change stat collection to batch stats together to make fewer network calls 2015-09-25 10:33:16 -07:00
James Pollack
54419301f3 Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672 2015-09-25 10:01:33 -07:00
ericrius1
baf4777750 Can now hold spray paint can without painting unless squeezing hard 2015-09-24 17:13:45 -07:00
James B. Pollack
b2bbaf4e7b Merge pull request #5899 from ericrius1/grabAPI 
Fixed a one line bug
 2015-09-24 16:52:43 -07:00
ericrius1
c2f1141d69 fix cat script 2015-09-24 16:40:20 -07:00
James Pollack
fd43956502 re add allTouchedIDs object 2015-09-24 16:35:59 -07:00
ericrius1
5ba8f15d9f test 2015-09-24 16:32:01 -07:00
ericrius1
ce0a726eb9 Fixed spraypaint for new particles 2015-09-24 16:27:17 -07:00
Brad Hefta-Gaub
c75284ccde Merge pull request #5891 from imgntn/doll_updates_1 
[Scripts] Doll Updates
 2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub
8fef47a488 Merge pull request #5873 from ericrius1/grabAPI 
[Scripts] handControllerGrab.js now handles touches.  Also handles grabs on non-colliding objects
 2015-09-24 15:58:14 -07:00
James Pollack
bc6a0c08f9 Fix merge conflict 2015-09-24 15:29:44 -07:00
James Pollack
8dacd736df fix weird multi line thing 2015-09-24 15:27:26 -07:00
James Pollack
49d3b7e93b fix indentation 2015-09-24 15:26:19 -07:00
James Pollack
9eb3b56e5d Remove space before and after function calls, add spaces btw functions 2015-09-24 15:03:02 -07:00
James Pollack
83a8636a36 Remove whitespace, batch entity edits 2015-09-24 14:49:28 -07:00
ericrius1
5da8b689c5 fix missing commas 2015-09-24 14:41:22 -07:00
ericrius1
4eb76b47a9 Merge remote-tracking branch 'origin/toybox' into toybox 
Conflicts:
	examples/toys/masterResetEntity.js
 2015-09-24 14:40:18 -07:00
ericrius1
536adf8981 testing paintcan 2015-09-24 14:39:11 -07:00
James Pollack
c1f8cbd1a3 Remove space before function calls, add spaces before functions 2015-09-24 14:07:15 -07:00
ericrius1
16f9140a08 updated master script so objects with fewer properties are on one line 2015-09-24 14:04:37 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
ericrius1
203af7cbba Merge branch 'master' into toybox 2015-09-24 12:03:21 -07:00
ericrius1
8609769c20 cat now listens for touch event from controller 2015-09-24 11:58:54 -07:00
ericrius1
1e1cfb6aae Flipped lights so up is lights on and vica versa 2015-09-24 10:15:50 -07:00
ericrius1
f334651a57 deleted handControllerGrab 2015-09-24 10:05:27 -07:00
Brad Hefta-Gaub
ba73acf3b4 Merge pull request #5843 from ctrlaltdavid/20681 
Replace point and vector particle emitter with spheroid emitter
 2015-09-24 08:19:49 -07:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
James Pollack
7efd15c3a2 Update doll to stop screaming when released, use only one hand a a time, spatialize audio position 2015-09-23 18:01:18 -07:00
James Pollack
37ecd18054 put distant grab inside of conditional 2015-09-23 17:44:28 -07:00
James Pollack
82f178a353 tweaks 2015-09-23 17:43:08 -07:00
ericrius1
81c175eabf toggle light switch 2015-09-23 17:34:37 -07:00
ericrius1
153a30de0d flip 2015-09-23 17:24:56 -07:00
James Pollack
381a24951e Update grab script to handle touching, better naming for non colliding grab functions 2015-09-23 16:56:46 -07:00
ericrius1
d0b5d62bb7 Updated master script to make jslint happy 2015-09-23 16:21:36 -07:00
ericrius1
a1dccc2a92 Changed cat position 2015-09-23 16:13:31 -07:00
Thijs Wenker
6bb873d327 createFlashlight.js - Close script after running 
Close the createFlashlight.js script after running once to prevent a flashlight from being created each time you start Interface
 2015-09-24 00:43:50 +02:00
ericrius1
276b0b71cb Added tin can to master script and changed its position 2015-09-23 14:52:59 -07:00
ericrius1
a2b0e66e13 Sound working for spraypaint 2015-09-23 13:36:00 -07:00
ericrius1
2c20a12f13 refactoring spraypaint to use new events 2015-09-23 13:34:21 -07:00
James Pollack
ba44390f79 Rename touch to grab non colliding 2015-09-23 13:20:21 -07:00
James Pollack
9736dee2d7 Merge branch 'grabAPI' of https://github.com/ericrius1/hifi into ericrius1-grabAPI 2015-09-23 13:12:45 -07:00
James Pollack
6b468ee87b Add the doll 2015-09-23 13:10:25 -07:00
ericrius1
b0923acc2f Reorg for pathing 2015-09-23 12:34:10 -07:00
ericrius1
6bd89f9689 Toys re-org 2015-09-23 12:22:18 -07:00
ericrius1
4f96f2406b Merge branch 'master' into toybox 2015-09-23 12:14:23 -07:00
ericrius1
c7cb77a6ab moved spraycan into toybox folder, and added spraypaint sound 2015-09-23 12:08:28 -07:00
ericrius1
9818e2549c handControllerscript is now on par with master 2015-09-23 11:38:30 -07:00
ericrius1
cc69f51882 Cat meows when hand is close 2015-09-23 11:30:14 -07:00
ericrius1
a7facc9f3c Adding a mew sound to cat when user moves hand close 2015-09-23 11:10:27 -07:00
ericrius1
8feabdb518 adding cat, modified dice positions 2015-09-23 10:54:56 -07:00
ericrius1
573cdc5271 Added another light switch- the garage light switch controls the three lights closest to it, and hallway light controls the two near hall 2015-09-23 10:07:59 -07:00
David Rowe
eb01ba9812 Merge branch 'master' into 20681 2015-09-23 09:42:56 -07:00
ericrius1
9d9de61afa updated die starting positions 2015-09-23 09:36:30 -07:00
ericrius1
cf701095c4 updated light switch sound volume to be 50% of what it was 2015-09-23 09:33:02 -07:00
Brad Hefta-Gaub
8d8035a418 Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning 
Conflicts:
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/Model.h
 2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
3fe4de4511 Merge pull request #5751 from imgntn/bubblewand_hotfix_2 
Bubble Wand
 2015-09-22 20:35:58 -07:00
James Pollack
fa1d5be310 Reduce volume, JSLint, Coding standards 2015-09-22 18:20:23 -07:00
James Pollack
3e3d7a8bfa JS Linting and Coding Standards 2015-09-22 18:12:51 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
ericrius1
99dc5a5127 updated doll's sound when picked up 2015-09-22 15:55:35 -07:00
ericrius1
f2afd66615 v2? 2015-09-22 15:50:46 -07:00
ericrius1
ad0c0d3b2b no v1 to avoid caching 2015-09-22 15:50:06 -07:00
ericrius1
55f76a4296 Added more sconce lights to lightSwitch.js 2015-09-22 15:45:18 -07:00
Brad Hefta-Gaub
5bcce50b98 Merge pull request #5846 from bob-long/master 
Display the face blend coefficients and update the value in real time.
 2015-09-22 14:56:56 -07:00
James Pollack
1e09c2501c This updates the flashlight to have sounds when it turns on and off 2015-09-22 14:21:14 -07:00
ericrius1
5546a04f4d Added flashlight to master script 2015-09-22 13:48:10 -07:00
ericrius1
135b34d82a Merge branch 'master' into toybox 2015-09-22 13:32:08 -07:00
ericrius1
42a2125336 Only asking for needed props 2015-09-22 13:29:54 -07:00
ericrius1
a28cf5ce8b updated grab script 2015-09-22 13:29:16 -07:00
ericrius1
a0bf7b6529 doll animation fixes 2015-09-22 13:20:17 -07:00
ericrius1
6298dcb2fc attempt fix for doll animation 2015-09-22 13:03:44 -07:00
Eric Levin
00e0523872 Merge pull request #5851 from imgntn/flashlight_updates_1 
Flashlight updates
 2015-09-22 13:01:26 -07:00
ericrius1
d273852bf9 New wand script 2015-09-22 12:56:01 -07:00
James Pollack
561b4ca8e1 Remove update loop refs, remove unload method 2015-09-22 12:52:24 -07:00
ericrius1
a266e8d65a updated reset script to use new wand script 2015-09-22 12:49:45 -07:00
James Pollack
e5c42c76a2 Remove update loop refs 2015-09-22 12:41:00 -07:00
ericrius1
2557b32e1a Updated switch model to be fbx 2015-09-22 12:40:09 -07:00
James Pollack
0ad238a508 Enlarge flashlight 2015-09-22 12:39:48 -07:00
ericrius1
b704ebd934 modified dice starting position 2015-09-22 09:55:24 -07:00
ericrius1
98faf3d712 Added light switch sound 2015-09-22 09:53:22 -07:00
ericrius1
b9db495ebf Modified handControllerGrab script to trigger entity touch events for non-physical entities 2015-09-22 09:38:06 -07:00
ericrius1
703545bac3 Modified lightSwitch entity to use new incoming grab API 2015-09-22 09:34:54 -07:00
ericrius1
e984afa1dd Merge branch 'master' into toybox 2015-09-22 08:56:39 -07:00
ericrius1
68bee8228b abstracted toggle logic to work with mouse click as well 2015-09-22 08:53:46 -07:00
Thijs Wenker
4d26eb5258 - added some comments 
- replaced repetitious code with loop
- fixed the audioListenerModeChanged signal (forgot connect call)
 2015-09-22 16:20:58 +02:00
Thijs Wenker
dfb9034b4e - delete new AudioListenerMode menu on script ending 
- style fix (function naming)
 2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7 - added MyAvatar.audioListenerModeChanged signal , for registering changes. 
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
 2015-09-22 15:38:53 +02:00
BOB LONG
a23a90bf5f Code simplification 
Simplify the code a bit as suggested:

1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation

Correct the js sample file header.

testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
 2015-09-21 19:11:13 -07:00
James B. Pollack
bf22d5a942 dont delete wand at cleanup from createWand.js 2015-09-21 17:43:05 -07:00
James B. Pollack
f8d743aff0 Update to use new grab methods, only specifically request properties that we are actually using 2015-09-21 17:38:49 -07:00
James B. Pollack
92152b250a Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2 2015-09-21 17:37:23 -07:00
James B. Pollack
81358b7f14 wand changes 2015-09-21 17:01:31 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
James B. Pollack
2cb875e40d Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2 2015-09-21 16:45:37 -07:00
James B. Pollack
cd6ad306ac start transitioning to new grab methods 2015-09-21 16:45:23 -07:00
ericrius1
a4e5f707cc Toggling lights 2015-09-21 16:35:30 -07:00
James B. Pollack
d79c1bec95 remove query string 2015-09-21 16:13:24 -07:00
James B. Pollack
fd67a2b86f Add on/off by pressure; add point bulb to end of flashlight 2015-09-21 16:10:08 -07:00
ericrius1
e4d630b1fc more light toggling additions 2015-09-21 15:57:03 -07:00
ericrius1
8678e07c21 Adding in light triggering logic 2015-09-21 15:45:54 -07:00
ericrius1
13d7834902 Merge remote-tracking branch 'upstream/master' into toybox 2015-09-21 14:51:33 -07:00
Philip Rosedale
26e5f1ca48 Merge pull request #5842 from SeijiEmery/platform-js 
Platform.js
 2015-09-21 14:28:34 -07:00
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
Seth Alves
fc68b31b71 Revert "Revert "edit.js adjustment"" 2015-09-12 08:23:50 -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