Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 08:56:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37270 commits 25 branches 0 tags 1.1 GiB
Commit graph

4975 commits

Author SHA1 Message Date
Stephen Birarda
0b1ecdec74 use just location to go to path 2015-11-09 15:49:54 -08:00
Stephen Birarda
57b4302e0d Fix setting of location in bat.js 2015-11-09 15:44:23 -08:00
Stephen Birarda
b6c4ae757b fix reference to pitchAndHideAvatar 2015-11-09 15:41:11 -08:00
Stephen Birarda
44ab236673 Fix include in bat.js 2015-11-09 15:33:23 -08:00
Stephen Birarda
244fd86d1e add semi-colons to bat.js 2015-11-09 15:31:53 -08:00
James B. Pollack
8fc702485b werk 2015-11-09 14:39:30 -08:00
Stephen Birarda
cea2e0fafd don't force location in continueNearGrab 2015-11-09 14:21:14 -08:00
Seth Alves
8a434c8ab1 don't attempt to near-grab things that aren't physical 2015-11-09 14:10:26 -08:00
Stephen Birarda
962881ad31 use startNearTrigger and startFarTrigger for create button 2015-11-09 13:43:52 -08:00
Atlante45
3228ca6033 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-09 13:41:31 -08:00
Atlante45
dcf545f462 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-09 13:41:23 -08:00
Atlante45
b15054c1fb Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:41:06 -08:00
Thijs Wenker
a58bd4ff05 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-09 22:37:44 +01:00
Stephen Birarda
d65571ea41 use the birarda baseball script on the createBatButton 2015-11-09 13:36:20 -08:00
Stephen Birarda
9ec51d822e send the avatar to /baseball on bat pickup 2015-11-09 13:35:54 -08:00
Stephen Birarda
119a702ebd Merge branch 'baseball' of https://github.com/huffman/hifi into baseball 2015-11-09 13:34:30 -08:00
Atlante45
6a53021818 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:23:31 -08:00
Anthony J. Thibault
a0f21228f6 AnimGraph support for start and stop animation from JavaScript 
Follows the same model as the existing startAnimation and stopAnimation calls.
See kneel.js for an example.
 2015-11-09 12:19:01 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params 
Add Ability to Pass Parameters When Calling Methods on Entities
 2015-11-09 12:17:58 -08:00
Ryan Huffman
a400d63960 Cleanup Baseball in pitching.js 2015-11-09 12:02:28 -08:00
Ryan Huffman
5d4ce6aefc Update include paths in pitching.js to be relative 2015-11-09 12:02:10 -08:00
James B. Pollack
45ad2cce39 Merge branch 'master' into bow 2015-11-09 11:58:39 -08:00
Ryan Huffman
069284d8d1 Remove unused variable and print in pitching.js 2015-11-09 11:51:08 -08:00
Ryan Huffman
278c921a50 Clean up bat.js 2015-11-09 11:35:56 -08:00
Ryan Huffman
38fcdc3eff Remove unused code from pitching.js 2015-11-09 10:59:46 -08:00
Ryan Huffman
661b2180f5 Update updateBillboard argument 2015-11-09 10:59:31 -08:00
Ryan Huffman
dad3ccb238 Cleanup pitching.js 2015-11-09 10:58:36 -08:00
Ryan Huffman
1b3d595d1e Add comment to PITCHING_MACHINE_OUTPUT_OFFSET_PCT 2015-11-09 10:58:18 -08:00
James B. Pollack
b496240283 Merge branch 'master' into bow 2015-11-09 10:54:54 -08:00
James B. Pollack
ef7caa8da9 Add new collision hull and sound to ping pong gun 2015-11-09 10:48:12 -08:00
Ryan Huffman
b6d26862fd Add headers to baseball script files 2015-11-09 10:33:07 -08:00
Ryan Huffman
ec31504c11 Add detection of missing entity billboards in pitching.js 2015-11-09 10:30:21 -08:00
Eric Levin
8e039fe465 Merge pull request #6338 from imgntn/string_polyfills 
Add More Methods to stringHelpers.js
 2015-11-09 10:25:13 -08:00
Eric Levin
ceba1c4b02 Merge pull request #6340 from imgntn/usertiming 
Adapt UserTiming library and Add Example
 2015-11-09 10:25:04 -08:00
Ryan Huffman
20bdc7ee85 Rename getPitchingMachine to getOrCreatePitchingMachine 2015-11-09 10:10:59 -08:00
Ryan Huffman
30841169ee Move functions in baseball.js to utils.js 2015-11-09 10:04:19 -08:00
Seth Alves
030bb71f19 Merge pull request #6337 from howard-stearns/fix-agent-avatar 
fix agent avatar animation
 2015-11-09 09:38:27 -08:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
James B. Pollack
bf4320e5cc re-add this example 2015-11-06 22:55:33 -08:00
James B. Pollack
34d98cac5e Update usertiming.js 2015-11-06 22:12:03 -08:00
James B. Pollack
369eec2abd Update usertimingExample.js 2015-11-06 22:05:30 -08:00
James B. Pollack
4fbff5d667 Update usertimingExample.js 2015-11-06 21:39:53 -08:00
Clément Brisset
517ef7dfc8 Merge pull request #6336 from ericrius1/avatarMover 
Restores the avatar mover app after its loss in S3
 2015-11-06 19:30:24 -08:00
James B. Pollack
c4318bcbd3 add easystar lib 2015-11-06 17:38:53 -08:00
James B. Pollack
f478261ed0 cleanup 2015-11-06 16:21:53 -08:00
James B. Pollack
5893bfeb06 add user timing 2015-11-06 16:19:49 -08:00
James B. Pollack
f7d4a3821f add more methods 2015-11-06 15:42:56 -08:00
Howard Stearns
619746676b Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script. 2015-11-06 15:31:03 -08:00
Ryan Huffman
e145d4955c Update tunnel detection to reverse all axes 2015-11-06 15:30:25 -08:00
Ryan Huffman
bc035b7e1e Adjust baseball speed to 7-15 m/s 2015-11-06 15:29:57 -08:00
ericrius1
c1690bcf32 restoring avatarMover app post S3-loss event 2015-11-06 15:19:14 -08:00
James B. Pollack
ced1a4899d promises 2015-11-06 15:10:23 -08:00
Ryan Huffman
51b14386a0 Adjust baseball pitch speed to 5-20 m/s 2015-11-06 15:08:35 -08:00
ericrius1
c289474909 avatr mover 2015-11-06 14:25:01 -08:00
ericrius1
a432a62dee model swapping 2015-11-06 13:53:25 -08:00
Atlante45
55c6706f76 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-06 13:31:39 -08:00
Atlante45
35b13b11eb Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-06 13:30:42 -08:00
Eric Levin
7be537c49c Merge pull request #6332 from imgntn/bubblwand_links 
Update Bubblewand Model References
 2015-11-06 13:28:27 -08:00
James B. Pollack
1d41ef868b update bubblewand model refs 2015-11-06 13:11:06 -08:00
Ryan Huffman
c964363ce5 Disable automatic playing of show in firework.js 2015-11-06 12:25:13 -08:00
Ryan Huffman
42e2c683fd Rename fireSounds to launchSounds 2015-11-06 12:24:52 -08:00
Ryan Huffman
4cce57881f Remove MAX_SIMULTANEOUS_FIREWORKS from firework.js 2015-11-06 12:24:19 -08:00
James B. Pollack
cf86d27417 cleanup headers 2015-11-06 11:50:34 -08:00
James B. Pollack
e928c8278b overload a single function and cleanup, add examples 2015-11-06 11:48:51 -08:00
Ryan Huffman
fbb47ecdda Remove hard-coded fireworks position from firework.js 2015-11-06 11:39:46 -08:00
Ryan Huffman
94bf2ecf27 Remove emitter pool from firework.js 2015-11-06 10:45:22 -08:00
Ryan Huffman
d5336db039 Cleanup print statements in pitching.js 2015-11-06 10:04:19 -08:00
Ryan Huffman
7da611d44b Adjust fireworks configuration in pitching.js 2015-11-06 10:03:57 -08:00
Ryan Huffman
5d2df1abbb Add helped function findEntity 2015-11-06 09:55:18 -08:00
samcake
63106f6991 Merge pull request #6322 from Atlante45/record 
Recording fixes from Clement.
 2015-11-06 09:28:58 -08:00
James B. Pollack
2fdc9202e4 Merge pull request #6313 from AlanZimmerman/playa 
Created playaSpawner
 2015-11-05 20:47:00 -08:00
AlessandroSigna
715b183a3c unified two ways to do the mapping in a single JS 2015-11-05 19:10:06 -08:00
AlessandroSigna
f9ebbea585 Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS 2015-11-05 19:09:49 -08:00
ericrius1
94c5637024 marketplace spawner 2015-11-05 17:27:30 -08:00
Thijs Wenker
de98a17ada - rename CameraEntityItem to AnchorEntityItem 2015-11-06 01:58:08 +01:00
Anthony Thibault
b6b596b8af Merge pull request #6284 from howard-stearns/away 
Away/Pause
 2015-11-05 15:28:47 -08:00
Atlante45
a2f0d8a066 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-05 15:14:32 -08:00
Atlante45
147cc088ba Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-05 15:14:23 -08:00
Atlante45
c1029450d9 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-05 15:14:15 -08:00
James B. Pollack
31b540ca38 mid test 2015-11-05 14:29:58 -08:00
ericrius1
f8de01a856 Fixed bug where eraser wouldn't erase 2015-11-05 14:14:49 -08:00
Atlante45
07b3597ae3 Fix recording scripts 2015-11-05 14:01:37 -08:00
Seth Alves
c4194f2359 don't try to grab polylines. set wantTrigger on various whiteboard parts 2015-11-05 13:26:23 -08:00
Howard Stearns
8f65ee87bc Clean up script, go away when putting HMD (not just on startup), and clear stopper properly. 2015-11-05 13:19:29 -08:00
Howard Stearns
aef8b7639d Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-05 11:58:08 -08:00
James B. Pollack
87503ca4c6 Merge branch 'master' into bow 2015-11-05 11:00:51 -08:00
James B. Pollack
c898d9a474 set wantstrigger correctly on lightswitch 2015-11-05 10:48:16 -08:00
Seth Alves
4a3b434fd4 change grabbing-non-colliding to trigger. fix whiteboard and some other scripts 2015-11-05 10:35:02 -08:00
James B. Pollack
7dc40548d3 Merge branch 'master' into bow 2015-11-05 10:21:37 -08:00
Seth Alves
4ffaa7db8e don't attempt to grab particles or zones 2015-11-05 09:46:39 -08:00
Seth Alves
7cb8adb090 get rid of code that computes release velocity 2015-11-05 09:45:06 -08:00
Seth Alves
3154b9d75f don't set release velocity 2015-11-05 09:44:50 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
AlessandroSigna
eac73671e0 Added some documentation and examples for the new mapping system 2015-11-04 17:40:35 -08:00
Seth Alves
05a977e31b get rid of code that computes release velocity 2015-11-04 16:26:30 -08:00
Seth Alves
adb9118dc1 don't set release velocity 2015-11-04 16:21:02 -08:00
Ryan Huffman
1c9e3434a9 Adjust behavior of tunnel-detection in pitching.js 2015-11-04 16:01:08 -08:00
ericrius1
b7840fdd6b explosion 2015-11-04 15:01:55 -08:00
Alan Z
8b20a3c903 Created playaSpawner and fixed cleanup issue 2015-11-04 14:41:11 -08:00
Ryan Huffman
6ae4ef78dd Update max fireworks in pitching.js to be 10 2015-11-04 14:38:48 -08:00
Ryan Huffman
4d5ed2efcf Fix fireworks not being deleted 2015-11-04 14:38:30 -08:00
Stephen Birarda
f67d4d33f4 make the crowd a bit louder 2015-11-04 14:32:36 -08:00
James B. Pollack
9b7bdca73a merge handcontroller 2015-11-04 14:12:00 -08:00
Seth Alves
1cbe6c4463 don't attempt to grab particles or zones 2015-11-04 13:59:37 -08:00
Ryan Huffman
e0ad714ab7 Clean up print messages in pitching.js 2015-11-04 13:11:34 -08:00
Ryan Huffman
2a115fc9ab Remove preallocation of particles in firework.js 2015-11-04 13:11:20 -08:00
Ryan Huffman
de69b2298b Decrease number of fireworks on high score 2015-11-04 12:55:18 -08:00
Thijs Wenker
ee218faf5e Merge branch '20724' of github.com:thoys/hifi into 20724 2015-11-04 21:21:57 +01:00
Thijs Wenker
0ebd6e47cc fix magic number 2015-11-04 21:21:03 +01:00
Ryan Huffman
8056498f39 Update pitching machine to shoot fewer fireworks 2015-11-04 12:11:07 -08:00
Ryan Huffman
bed7a1f5c3 Improve performance of fireworks 2015-11-04 12:10:42 -08:00
Ryan Huffman
d0d3aaa09c Update bat.js to ensure pitching machine is running in continueNearGrab 2015-11-04 12:10:19 -08:00
Howard Stearns
4fd2027fb4 change name 2015-11-04 11:42:21 -08:00
Stephen Birarda
d5c6b0bdc0 allow a distance grab on the create bat button 2015-11-04 11:31:01 -08:00
ericrius1
3c227db08d explode heli 2015-11-04 11:27:16 -08:00
Atlante45
8223e032c0 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-04 11:26:46 -08:00
Atlante45
234271a40d Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-04 11:26:38 -08:00
Atlante45
d9cd986db2 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-04 11:26:16 -08:00
Thijs Wenker
128a0c2397 securityCamera.js - Camera Entity example 2015-11-04 20:23:03 +01:00
Seth Alves
c2f9a49598 don't grab light 2015-11-04 11:15:57 -08:00
Howard Stearns
3fdd7ca470 obscure the code and increase the likelihood of future whitespace-only diffs 2015-11-04 10:57:03 -08:00
Howard Stearns
883f9c09bf add gratuitous whitespace 2015-11-04 10:49:12 -08:00
Howard Stearns
fe12891f61 whitespace only 2015-11-04 10:48:02 -08:00
Seth Alves
1e498a41f0 rework search logic 2015-11-04 10:46:20 -08:00
Howard Stearns
7b9245022c Merge branch 'away' of https://github.com/howard-stearns/hifi into away 2015-11-04 10:46:16 -08:00
Stephen Birarda
ff2438ef03 use bat script that fully hides avatar 2015-11-04 10:23:06 -08:00
Stephen Birarda
8607a1ef50 Revert "remove continueNearGrab from bat script" 
This reverts commit ea2b9e906b.
 2015-11-04 10:22:53 -08:00
Stephen Birarda
c2b0d127f3 use bat script without continued near grab 2015-11-04 09:33:42 -08:00
Stephen Birarda
ea2b9e906b remove continueNearGrab from bat script 2015-11-04 09:33:09 -08:00
Stephen Birarda
73aa016d8c use rawgit URL for bat script 2015-11-04 09:23:16 -08:00
Ryan Huffman
cb2a698488 Update urls in baseball scripts to be absolute 2015-11-04 09:22:05 -08:00
Ryan Huffman
f5c89dedb5 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-04 08:56:01 -08:00
EdgarPironti
ade0862948 Spacemouse fixes 2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
Zach Pomerantz
df4be6c0ba Add growth script to examples 2015-11-03 23:48:05 -08:00
James B. Pollack
46294e3e26 Merge branch 'master' into bow 2015-11-03 20:10:28 -08:00
Brad Davis
439bdbc0e4 Merge pull request #6298 from samcake/controllers 
Controllers : Removing dead files
 2015-11-03 19:57:37 -08:00
Thijs Wenker
d60661ff8a preview camera button in edit.js script 2015-11-04 03:24:32 +01:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 18:22:29 -08:00
Thijs Wenker
d7279e4c88 Support for Camera Entities. 
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
 2015-11-04 02:51:23 +01:00
Atlante45
55894f2eee Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 17:46:24 -08:00
Atlante45
04f4e49158 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-03 17:45:43 -08:00
Howard Stearns
4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 17:42:38 -08:00
Stephen Birarda
9ae3c8b593 change bat relative rotation yaw to 90 2015-11-03 16:58:30 -08:00
Stephen Birarda
e7bc2e349a use real userData in createBatButton script 2015-11-03 16:55:11 -08:00
Stephen Birarda
9488a8ed24 use HTTP URL for bat script URL 2015-11-03 16:42:31 -08:00
Stephen Birarda
5b3809b543 update the bat script URL 2015-11-03 16:13:14 -08:00
Stephen Birarda
804db537bf volume changes for crowd, bat avatar suppression fix 2015-11-03 16:11:13 -08:00
Atlante45
d8797ef9d7 Initialize relativePosition/Rotation 2015-11-03 16:07:37 -08:00
Brad Hefta-Gaub
d21415b00d Merge pull request #6295 from imgntn/cleanup_tests 
Remove timers test file
 2015-11-03 15:43:02 -08:00
samcake
57bc2f3093 Removing dead js files 2015-11-03 15:37:36 -08:00
howard-stearns
4bf9861350 Forgot license header. 2015-11-03 15:36:02 -08:00
ericrius1
0650280fb6 tweaks 2015-11-03 15:14:56 -08:00
ericrius1
ed2bd07585 rotating blade 2015-11-03 14:54:05 -08:00
Stephen Birarda
8c0592caba add semicolons to createBatButton script 2015-11-03 14:52:40 -08:00
Ryan Huffman
5211824e0e Fix script include paths in firework.js and pitching.js 2015-11-03 14:43:43 -08:00
Stephen Birarda
501b905e7a change script URL for bat to HTTP 2015-11-03 14:25:38 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
Stephen Birarda
06dbe2693a fix for created bat properties 2015-11-03 14:21:52 -08:00
ericrius1
0846c3bef4 moving 2015-11-03 14:12:56 -08:00
James B. Pollack
b83b24b096 remove strange test file 2015-11-03 13:42:18 -08:00
Ryan Huffman
644e1008bd Fix bat.js not setting pitchingMachine variable 2015-11-03 13:32:28 -08:00
ericrius1
58587a5780 spotlight 2015-11-03 13:26:39 -08:00
howard-stearns
fb4174b9a2 Control alphaVar, and deal with overlapping cycles. 2015-11-03 13:11:31 -08:00
James B. Pollack
f0fbd67e93 merge 2015-11-03 13:00:25 -08:00
ericrius1
443df042a4 playing with light pos/rot 2015-11-03 12:40:41 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
Ryan Huffman
2b8c6ebaf1 Add firework show when distance hit > 200 2015-11-03 12:14:55 -08:00
Ryan Huffman
3056432b0c Add fireworks 2015-11-03 12:14:04 -08:00
ericrius1
82dbdec78c helicopter 2015-11-03 11:54:01 -08:00
Atlante45
f4b5933af4 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:21:39 -08:00
James B. Pollack
811fd0cec7 prep for meeting 2015-11-03 10:42:15 -08:00
Seth Alves
27b239176f fix grab 2015-11-03 10:16:56 -08:00
Howard Stearns
70b1165393 Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 10:01:36 -08:00
EdgarPironti
5d695da630 Do not merge - Spacemouse 2015-11-02 23:31:10 -08:00
Howard Stearns
1b7ed3d847 away script 2015-11-02 20:40:40 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu 
add example of overriding default rightClick behavior
 2015-11-02 18:58:12 -08:00
Atlante45
1928753dda Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 18:14:53 -08:00
James B. Pollack
aeac31cf6a dont delete cubes by default 2015-11-02 16:37:24 -08:00
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
Ryan Huffman
91a1378889 Clean up foul/strike in pitching.js 2015-11-02 16:09:51 -08:00
James B. Pollack
15af28337b add color busters game for testing 2015-11-02 16:02:30 -08:00
Ryan Huffman
1b673a99c0 Fix updating of distance/high score 2015-11-02 15:59:55 -08:00
Ryan Huffman
3cbcc6494f Update bat.js to lazy load the pitching machine 2015-11-02 15:34:42 -08:00
Ryan Huffman
def8294b60 Fix pitching machine not starting when enabled 2015-11-02 15:28:18 -08:00
Ryan Huffman
8b6db3b6c0 Add shouldRenderLocally to bat.js and fix findEntities 2015-11-02 15:13:07 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
Stephen Birarda
bbf5991f9a resolve conflicts on merge with huffman/baseball 2015-11-02 14:14:36 -08:00
Ryan Huffman
f4531759be Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 12:27:08 -08:00
Ryan Huffman
7f4a8e9d7d Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-02 12:25:51 -08:00
Ryan Huffman
b8d90ab28e Replace pitching.js include with relative path 2015-11-02 12:12:54 -08:00
Ryan Huffman
3820adf3f6 Add bat.js 2015-11-02 12:12:21 -08:00
Ryan Huffman
72775a7af8 Clean up pitching.js so the pitching machine code is separate 2015-11-02 12:12:05 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs 
Add functional.js library
 2015-11-02 11:10:19 -08:00
James B. Pollack
e79ebdb8aa cleanup syntax 2015-11-01 19:47:13 -08:00
Brad Hefta-Gaub
286905c20c Merge pull request #6250 from jherico/peek 
Adding peek support for endpoints
 2015-10-31 16:09:27 -07:00
Seth Alves
9346366fc5 fix grab script 2015-10-31 14:28:54 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
46f9a432ab fix handControllerGrab.js 2015-10-31 14:21:50 -07:00
James B. Pollack
459b449a7f rename folder 2015-10-30 20:52:19 -07:00
James B. Pollack
0a083c070f color busters cooperative game 2015-10-30 20:21:53 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
James B. Pollack
c67bfc8883 Merge pull request #6180 from huffman/line-js 
Add js line library for drawing infinite poly lines
 2015-10-30 17:47:31 -07:00
Seth Alves
944f0965c0 some refactoring and a bug fix -- grab script can throw things again 2015-10-30 16:35:50 -07:00
Ryan Huffman
77e0023b43 Fix lifetime bug with first PolyLine in InfiniteLine 2015-10-30 16:31:15 -07:00
Seth Alves
cf83ca22bb change how kinematic objects get data back to entity when an action is active 2015-10-30 15:30:54 -07:00
Atlante45
b0650cc2c1 Remove accidentally commited file 2015-10-30 14:37:06 -07:00
Atlante45
bc552c772b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-30 14:05:40 -07:00
Seth Alves
b102081f2f upon release, set velocity after returning entity to being dynamic 2015-10-30 11:35:51 -07:00
Clément Brisset
317674c89a Merge branch 'grab' of https://github.com/sethalves/hifi 2015-10-30 11:13:56 -07:00
Brad Hefta-Gaub
b5fd3424b8 Merge pull request #6245 from EdgarPironti/controllers 
Fixed controllerExample.js parse error
 2015-10-30 11:10:08 -07:00
EdgarPironti
f887bbd45c Fixed controllerExample parse error 2015-10-30 11:06:20 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
James B. Pollack
ad9cfbab50 end of day 2015-10-29 17:24:43 -07:00
James B. Pollack
846310f9fb Merge pull request #6208 from ericrius1/closePaintModel 
Added to the whiteboard model, and some bug fixes
 2015-10-29 17:05:20 -07:00
ericrius1
6bdf66534f light tweak 2015-10-29 16:53:03 -07:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
ericrius1
b6b71e7e76 increased range and intensity of light 2015-10-29 16:40:50 -07:00
Ryan Huffman
03a082383f Convert billboard display to feet and cleanup trails earlier 2015-10-29 16:10:17 -07:00
Ryan Huffman
8a29f4fc61 Add distances and billboard display to pitching.js 2015-10-29 16:09:33 -07:00
James B. Pollack
24df6552b5 Merge branch 'master' into bow 2015-10-29 15:59:23 -07:00
James B. Pollack
342760de56 Merge branch 'master' into bow 2015-10-29 15:58:57 -07:00
Clément Brisset
e818028043 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-29 15:53:44 -07:00
Clément Brisset
0ea2ca589b Merge branch 'physics-ccd' of https://github.com/huffman/hifi 
Conflicts:
	examples/libraries/walkApi.js
	examples/toybox/flashlight/flashlight.js
	examples/walk.js
 2015-10-29 15:47:14 -07:00
Atlante45
c237072195 edit.js fix 2015-10-29 15:29:12 -07:00
James B. Pollack
48a295f4bc werk 2015-10-29 15:24:04 -07:00
Stephen Birarda
d03a837263 resolve conflicts on merge with upstream master 2015-10-29 14:28:50 -07:00
ericrius1
020566b76a no deleting 2015-10-29 14:14:15 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
Ryan Huffman
a7517ff210 CP 2015-10-29 14:01:53 -07:00
Brad Davis
036ae62dd3 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-29 14:00:52 -07:00
Brad Hefta-Gaub
1c2973f17d removed old metavoxel example, since the api is no longer available 2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged 
Handle input plugin register/remove when activated/deactivated by menus
 2015-10-29 12:24:17 -07:00
James B. Pollack
7166c6ddd2 through arrow in notch with rotation 2015-10-29 12:23:32 -07:00
James B. Pollack
028ea584b8 updating bow 2015-10-29 11:23:03 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color 
Refactor the KeyLIght properties in their own group
 2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds 
Add Arcade Game Sound To Toybox
 2015-10-29 10:24:23 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl 
fix actions bug
 2015-10-29 09:30:21 -07:00
James B. Pollack
8695963dd1 end of day 2015-10-28 19:10:16 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
Stephen Birarda
2ecec2623c add a script for bat creation on button click 2015-10-28 17:03:25 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00
ericrius1
1b1490bb75 added blocker so user cant get so close to whiteboard 2015-10-28 16:02:15 -07:00
ericrius1
e9bdb872bd added light to whiteboard 2015-10-28 15:25:11 -07:00
James B. Pollack
24a5cdc19e through notching the arrow 2015-10-28 14:00:37 -07:00
Brad Davis
570b4a32da Merge pull request #6206 from samcake/controllers 
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
 2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
ericrius1
ac2effb33c Not erasing board, models hosted on s3 2015-10-28 13:32:10 -07:00
James B. Pollack
68a4365fa5 changes for arrow entity reload 2015-10-28 13:27:31 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
ericrius1
4027782335 Fixed issue with overlays disapearing on release grab 2015-10-28 13:18:57 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
James B. Pollack
4e6234741a reenable both hands to pick up arrow 2015-10-28 10:24:09 -07:00
James B. Pollack
369cf8e454 update model paths 2015-10-28 10:22:51 -07:00
James B. Pollack
0003eecf08 remove reload feature to prep for arrow netity 2015-10-28 10:20:35 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
James B. Pollack
8b78278a79 end of day 2015-10-27 18:26:12 -07:00
ericrius1
2f835b19fa surface is now a model 2015-10-27 17:17:19 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Ryan Huffman
e9a2e91374 Add tunneling handling to pitching.js 2015-10-27 15:35:37 -07:00
Ryan Huffman
779cadd5bd Merge branch 'baseball' of github.com:Atlante45/hifi into baseball 2015-10-27 15:14:30 -07:00
ericrius1
d67f4958cd wait longer for dimensions 2015-10-27 13:44:29 -07:00
ericrius1
ed6a866ff9 ready for demo 2015-10-27 13:43:13 -07:00
Ryan Huffman
b46d42889d Add foul and strike audio to baseball game 2015-10-27 13:25:43 -07:00
ericrius1
0512da0e39 updated url 2015-10-27 13:07:11 -07:00
ericrius1
25ded2bd92 added shapetype 2015-10-27 13:03:44 -07:00
ericrius1
8fcc071026 only can draw on whiteboard 2015-10-27 12:24:29 -07:00
Atlante45
1bebdc8e70 Fix scripts syntax errors 2015-10-27 12:11:27 -07:00
ericrius1
f0a1335957 fixed paint initially showing up white 2015-10-27 12:09:07 -07:00
ericrius1
fa22249f7a Improving model 2015-10-27 12:03:30 -07:00
Atlante45
c9f49ca992 Remove baseball script 2015-10-27 11:53:46 -07:00
Stephen Birarda
7e8aec9db9 fix double URL scheme 2015-10-27 11:48:52 -07:00
Stephen Birarda
12aadd7cf2 Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball 2015-10-27 11:06:41 -07:00
Stephen Birarda
3fa4f7138a add more sounds to the crowd, ping AssetServer from Agent 2015-10-27 10:58:31 -07:00
ericrius1
8a85468254 changing model, repositioning 2015-10-27 10:39:44 -07:00
Atlante45
e04d9de4a4 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-27 10:28:10 -07:00
Ryan Huffman
6c306e991b Merge branch 'baseball' of github.com:Atlante45/hifi into baseball 2015-10-27 10:25:22 -07:00
Ryan Huffman
2cd2af2b13 Add headers to line.js and lineExample.js 2015-10-27 09:49:52 -07:00
Ryan Huffman
983c551ce3 Clean up line.js and make lifetime settable 2015-10-27 09:13:16 -07:00
James B. Pollack
d78fe089f6 add mit license 2015-10-26 17:00:54 -07:00
Ryan Huffman
2abb6a2fd5 Clean up line.js 2015-10-26 16:45:58 -07:00
Ryan Huffman
1a1ab29978 Add lineExample.js 2015-10-26 16:45:43 -07:00
James B. Pollack
37778286da Merge branch 'master' into bow 2015-10-26 16:41:53 -07:00
James B. Pollack
a1cd4a31cb fix typo 2015-10-26 16:41:03 -07:00
James B. Pollack
88a312f992 add functional js library... mmm, curry 2015-10-26 16:28:18 -07:00
James B. Pollack
da5db326e8 make cat quieter 2015-10-26 16:03:10 -07:00
Brad Hefta-Gaub
9c4199ef16 Merge pull request #6186 from jherico/pingpong 
Fixing spray can script
 2015-10-26 14:56:06 -07:00
Atlante45
2f50652544 Merge branch 'script-engine' into baseball 2015-10-26 14:17:40 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
Brad Davis
d91d0a2027 Fixing spray can script 2015-10-26 12:47:31 -07:00
James B. Pollack
fc8184ffed add arcade sound 2015-10-26 12:25:51 -07:00
James B. Pollack
fb5b600211 bow work 2015-10-26 12:25:01 -07:00
Stephen Birarda
47e8a1bdf7 connect to correct signal for sound ready 2015-10-26 12:15:08 -07:00
Stephen Birarda
61ad91aba6 hook Sound downloaded to start playback 2015-10-26 12:09:48 -07:00
Atlante45
9d6f55ea93 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-26 11:59:53 -07:00
Stephen Birarda
e8c6acfeb6 update baseball crowd to loop better 2015-10-26 11:58:49 -07:00
Brad Davis
34b5178393 Fixing ping-ping entity script 2015-10-26 11:55:23 -07:00
Atlante45
1e4a414f9d Fix scripts syntax errors 2015-10-26 11:33:36 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Ryan Huffman
d6230fbed3 Remove trailing commas in line.js 2015-10-26 10:46:36 -07:00
Ryan Huffman
6b9b4d4e6e Add libraries/line.js 2015-10-26 10:44:39 -07:00
James B. Pollack
c0cb8b542e add notching system, add fire 2015-10-25 22:47:02 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Davis
f61cf843bc Merge pull request #6172 from ZappoMan/fixScripts 
fix walkApi.js to detect hydra in official way
 2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2 
fix toyball.js
 2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub
0b99728575 Merge pull request #6175 from AlessandroSigna/controllers 
fix stick.js
 2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub
3a2328a887 Merge pull request #6173 from EdgarPironti/controllers 
Fixed sword.js
 2015-10-23 20:07:52 -07:00
AlessandroSigna
7f3f202567 fix stick.js 2015-10-23 18:23:15 -07:00
samcake
eae316100a Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 18:18:27 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
EdgarPironti
0d15182adb Fixed sword.js 2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub
4a19a14682 fix walkApi.js to detect hydra in official way 2015-10-23 17:53:34 -07:00
Brad Davis
304fe49628 Merge pull request #6170 from ZappoMan/fixScripts 
various controller script updates
 2015-10-23 17:43:54 -07:00
James B. Pollack
29de3581dd end of day 2015-10-23 17:39:03 -07:00
Brad Hefta-Gaub
060f87d14a CR feedback 2015-10-23 17:33:45 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
Brad Hefta-Gaub
9aaef9aabd fix hydraPaint.js to use new API 2015-10-23 17:32:06 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
Brad Davis
4e6f64833f Conditional support from JS 2015-10-23 17:24:04 -07:00
Brad Hefta-Gaub
9ba1b800d9 CR feedback 2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b CR feedback 2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub
ed20e7d209 CR feedback 2015-10-23 17:14:13 -07:00
EdgarPironti
c64290b5cd Removed unused variables 2015-10-23 17:13:29 -07:00
Brad Hefta-Gaub
9285cf8e2c fix hydraGrabHockey.js to use new API 2015-10-23 17:12:26 -07:00
Atlante45
667eec2f46 change collision hull 2015-10-23 16:43:59 -07:00
Atlante45
7487c7bd0a Move baseball.js 2015-10-23 16:32:27 -07:00
Atlante45
c1cd7dd50a Work on robot animation and bat hull 2015-10-23 16:31:38 -07:00
Brad Hefta-Gaub
6b795364c8 make handGrab treat shoulder bumbers and triggers as merged control 2015-10-23 16:30:40 -07:00
EdgarPironti
5c09391170 fix toyball.js 2015-10-23 16:19:40 -07:00
AlessandroSigna
5d8d8c8f0d Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 15:50:39 -07:00
AlessandroSigna
37e1e43ce0 Fix paddleBall.js 2015-10-23 15:48:29 -07:00
James B. Pollack
6e8d505726 updates 2015-10-23 14:38:17 -07:00
Brad Hefta-Gaub
7e3192d0f6 fix drumstick.js 
fix drumstick.js
 2015-10-23 14:22:50 -07:00
James B. Pollack
63d18acf91 bow updates 2015-10-23 14:12:56 -07:00
AlessandroSigna
6001968d92 Fix paddleBall.js 2015-10-23 13:52:22 -07:00
AlessandroSigna
4c14cd757b Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 13:47:16 -07:00
Brad Davis
56deef9d6e Moving omniTool to a route mapped input 2015-10-23 13:40:36 -07:00
Brad Davis
be148686a7 Fixing omnitool 2015-10-23 13:40:36 -07:00
Brad Davis
d83ad7fdc1 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-23 13:35:24 -07:00
AlessandroSigna
c2078aca3f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 11:27:16 -07:00
EdgarPironti
5bae83173c Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 11:16:02 -07:00
Atlante45
8c08ad38d7 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-23 10:43:18 -07:00
James B. Pollack
6392b7080b move scripts no longer in toybox to better locations 2015-10-23 10:36:32 -07:00
Brad Davis
63df9fb959 Fixing raw sound playback and air guitar 2015-10-22 22:37:18 -07:00
AlessandroSigna
ae2f7f6ff6 Fix paddleBall.js 2015-10-22 18:50:23 -07:00
EdgarPironti
eaaec516c2 fix controllerExample 2015-10-22 18:41:57 -07:00
Brad Davis
103fe3c545 Merge pull request #6155 from ZappoMan/fixScripts 
fix airGuitar.js
 2015-10-22 18:19:26 -07:00
samcake
3e4bada313 remove uneeded var 2015-10-22 18:03:47 -07:00
James B. Pollack
ca0aad7d3b update after updating models 2015-10-22 17:25:15 -07:00
Atlante45
70c32e4b13 Remove empty script 2015-10-22 16:45:57 -07:00
Atlante45
05b794259e Script cleanup and particles on ground collisions 2015-10-22 16:43:37 -07:00
Stephen Birarda
1d5d655814 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-22 16:29:44 -07:00
Stephen Birarda
4f6da68a1f add getJointPosition and getJointRotation for entities 2015-10-22 16:25:28 -07:00
samcake
9015e98b70 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 16:13:54 -07:00
samcake
0ad4634eac Check that the velocity information is passed correctly and fixed clap.js 2015-10-22 16:13:12 -07:00
samcake
2db87e0d2d Remove hydramove.js and expose the velocity and angular Velocity for hydra 2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -07:00
Stephen Birarda
06872a6c04 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-22 14:45:20 -07:00
Stephen Birarda
cfa47d2fc6 use triggers to swing with robot 2015-10-22 14:45:08 -07:00
Brad Davis
5227c40298 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-22 12:15:41 -07:00
samcake
2ebf862da9 Merge pull request #6148 from jherico/controllerFunctions 
Fixing controller functions & makeAxis
 2015-10-22 11:56:58 -07:00
EdgarPironti
09cdc01599 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 11:50:45 -07:00
Brad Davis
7ed9ed8500 Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS 
make handControllerGrab.js work with new API
 2015-10-22 11:40:48 -07:00
Stephen Birarda
a9bad8de66 add a script for ambient crowd noise 2015-10-22 11:12:02 -07:00
Brad Davis
6cf0bdcffe Testing function destination and fixing bug in rule ordering for multi-soure 2015-10-22 10:00:11 -07:00
Brad Davis
5d4cbfdacb Resolving ambiguity between functions and inputs differently 2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub
3e7364608b make handControllerGrab.js work with new API 2015-10-22 09:17:29 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
Atlante45
d8e997d91f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-21 17:52:30 -07:00
Ryan Huffman
934575a78a Refactor pitching.js 2015-10-21 16:46:07 -07:00
EdgarPironti
f3dd529a5f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-21 15:02:40 -07:00
Ryan Huffman
8f83870e52 Update pitching.js to add audio 2015-10-21 14:19:21 -07:00
James B. Pollack
b8f0972228 move bow into toybox 2015-10-21 14:00:51 -07:00
James B. Pollack
4e8c306f66 Merge branch 'master' into bow 2015-10-21 14:00:19 -07:00
James B. Pollack
cf10277f2d Merge branch 'master' into bow 2015-10-21 13:47:19 -07:00
James B. Pollack
5b417a1ba5 use updated hand controller 2015-10-21 13:47:17 -07:00
Brad Hefta-Gaub
d865eb2e24 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 12:46:26 -07:00
James B. Pollack
384a6a8154 rename /toys to /toybox, remove non toybox scripts, update master refs 2015-10-21 11:36:49 -07:00
Eric Levin
970d189262 Merge pull request #6125 from imgntn/toybox_ac 
[Scripts] Add Toybox AC Scripts, cleanup their headers, organize
 2015-10-21 11:24:59 -07:00
Stephen Birarda
e28cc12dd8 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-21 10:56:03 -07:00
James B. Pollack
0b06cf1dfb cleanup 2015-10-21 10:53:32 -07:00
James B. Pollack
68d43dc576 reduce number of toybox sound scripts 2015-10-21 10:50:37 -07:00
Stephen Birarda
e9ed6b8886 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-21 10:10:09 -07:00
Stephen Birarda
bfd9619404 add simple script that spawns a bat when run 2015-10-21 10:10:04 -07:00
Ryan Huffman
21903b746c CP 2015-10-21 10:06:51 -07:00
Brad Davis
21a3079a39 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 10:05:32 -07:00
James B. Pollack
80fb12b1a4 Merge branch 'master' into toybox_ac 2015-10-21 09:58:49 -07:00
Brad Hefta-Gaub
6465bb85dd Merge pull request #6124 from imgntn/bball_fixes 
[Scripts]  Fix Basketball Solidity in Toybox
 2015-10-21 09:11:12 -07:00
Seth Alves
f85ef9267b oops 2015-10-20 18:29:27 -07:00
Seth Alves
311254c395 require user-data to have wantsTrigger in it before non-colliding calls will happen 2015-10-20 18:26:12 -07:00
samcake
e0615309bb Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 17:48:38 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -07:00
Seth Alves
7dcbb5849a another bug 2015-10-20 17:44:12 -07:00
Seth Alves
ed480f651f missed a line 2015-10-20 17:43:31 -07:00
Seth Alves
f16b62df83 - grab script: possible fix for line disappearing 
- grab script: go from 3 pickrays back to 1
- grab script: put "sphere" test back in, but with fixed distance test
 2015-10-20 17:34:35 -07:00
Ryan Huffman
c67eafffba Add pitching.js 2015-10-20 16:59:03 -07:00
James B. Pollack
8e1c3c32d1 additions to debug and also to handle some two handed situations 2015-10-20 16:24:17 -07:00
James B. Pollack
fd0dc3cd49 bow and grab 2015-10-20 16:22:30 -07:00
Atlante45
8d4d4a555c Add kinematicGrab option in handControllerGrab.js 2015-10-20 16:00:38 -07:00
James B. Pollack
d01faad9ed Merge branch 'master' into bow 2015-10-20 14:49:55 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -07:00
James B. Pollack
31f1dfe25c good two handed stuff 2015-10-20 13:35:28 -07:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
James B. Pollack
b29f0b13a9 Merge branch 'master' into bow 2015-10-20 12:22:25 -07:00
James B. Pollack
8f0cc42859 normalize line endings 2015-10-20 12:22:12 -07:00
James B. Pollack
b0ae55ee63 update cat purr header 2015-10-20 11:28:04 -07:00
James B. Pollack
771e5a4f9d add toybox ac scripts, write headers for them, organize 2015-10-20 11:21:09 -07:00
James B. Pollack
af09871bed fix basketball solidity in toybox 2015-10-20 11:08:28 -07:00
James B. Pollack
a4166fd1c3 bow stuff 2015-10-20 10:54:24 -07:00
samcake
16f96715a3 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 10:16:08 -07:00
Brad Davis
8d0148a1ca Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 10:13:31 -07:00
Brad Hefta-Gaub
dfe3e5b1cb fix laser lifetimes 2015-10-20 09:30:27 -07:00
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -07:00
James B. Pollack
1daeedec9b end of day 2015-10-19 18:04:08 -07:00
Seth Alves
41f7ef1e2e cleanups 2015-10-19 16:53:27 -07:00
Seth Alves
6138775270 put back support for spatialKey 2015-10-19 15:40:14 -07:00
Seth Alves
5a968e3c96 tweak 2015-10-19 15:20:04 -07:00
Seth Alves
8fbf081223 git rid of sphere test 2015-10-19 14:51:18 -07:00
James B. Pollack
3ddfce911e bow, arrow, createbow 2015-10-19 01:37:47 -07:00
James B. Pollack
62206b747f bow work 2015-10-19 01:07:27 -07:00
James B. Pollack
2158af0fe3 making a bow 2015-10-18 22:26:50 -07:00
Brad Hefta-Gaub
8578b40236 get JS source functions working across threads 2015-10-17 14:14:45 -07:00
Brad Hefta-Gaub
7956d737ab fix thread safety issue on JS based fliters 2015-10-17 14:08:21 -07:00
Seth Alves
353f92f1ba Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-17 13:09:52 -07:00
Brad Hefta-Gaub
f90f0ed1f3 apply Huffman's feedback to Sam's PR 2015-10-17 12:34:32 -07:00
Brad Hefta-Gaub
fd5a5bb104 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:22:39 -07:00
Brad Hefta-Gaub
75c59fad99 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:18:14 -07:00
samcake
941f95c7d4 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-16 18:07:25 -07:00
samcake
20416455db Adding the loadMapping feature 2015-10-16 18:06:58 -07:00
samcake
f675035fd1 Merge pull request #6101 from jherico/controllers 
Hydra controller updates and test code
 2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
James B. Pollack
31cc451fd4 css cleanup 2015-10-16 16:42:29 -07:00
James B. Pollack
c6fcaf158b add color to more props 2015-10-16 16:15:20 -07:00
James B. Pollack
aa6aaf912e add color bars below position inputs 2015-10-16 16:07:20 -07:00
samcake
6d3d29b6b7 Adding a new mapping 2015-10-16 15:24:44 -07:00
Seth Alves
aaad1a4a36 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 14:34:21 -07:00
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -07:00
James B. Pollack
4b21bdf308 testing 2015-10-16 11:50:13 -07:00
Seth Alves
c98685f6d3 in STATE_CONTINUE_FAR_GRABBING_NON_COLLIDING, when the ray moves off of the entity, switch back to search state 2015-10-16 11:39:27 -07:00
Seth Alves
066696e201 don't go into continue-far-grabbing-non-colliding mode. 2015-10-16 11:18:41 -07:00
samcake
43d7fe491e wiring the actions 2015-10-15 17:53:53 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub
c3ee419ad7 Merge pull request #6086 from imgntn/flashlight_life 
[Scripts] Add lifetime to lights created by flashlight
 2015-10-15 17:42:57 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -07:00
Seth Alves
c884f466bc adjust timing of action refresh 2015-10-15 10:40:58 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
James B. Pollack
d8c979b9d4 add lifetime to lights created by flashlight 2015-10-15 10:07:21 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
samcake
12e103c90c Get json creating the mappings from js 2015-10-14 17:41:39 -07:00
ericrius1
87439a049e Made color indicator thinner 2015-10-14 17:22:46 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
ericrius1
5082ac4583 Added color status bar 2015-10-14 16:46:23 -07:00
ericrius1
4c709cba35 Fixed color indicator position 2015-10-14 16:17:57 -07:00
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
Eric Levin
0b92bc11f6 fixed spacing 2015-10-14 13:26:10 -07:00
ericrius1
eb7b720945 got rid of whitespace 2015-10-14 13:24:22 -07:00
ericrius1
db5f7cac8d Fixed name of whiteboard entity script URL 2015-10-14 12:03:10 -07:00
ericrius1
c63ef10c67 got rid of query string 2015-10-14 11:50:35 -07:00
ericrius1
0991be3255 got rid of printing statements 2015-10-14 11:44:47 -07:00
ericrius1
22615dae07 Don't delete board on script close 2015-10-14 11:43:05 -07:00
ericrius1
6cd9bf407f Reverted handControllerGrab 2015-10-14 11:40:06 -07:00
ericrius1
7fb6b7e272 Reverted hand controller 2015-10-14 11:31:09 -07:00
ericrius1
d072a2efd3 laser pointer now showing up all the time 2015-10-14 11:26:38 -07:00
ericrius1
1a9c1110c0 Fixed gap between strokes 2015-10-14 11:17:54 -07:00
ericrius1
20d1a2440c Ignoring unknown types in collision 2015-10-14 11:15:49 -07:00
Brad Davis
f051a84dc6 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-14 10:54:32 -07:00
ericrius1
caacbcbe78 Adjust erase box position 2015-10-14 10:40:55 -07:00
Seth Alves
2a9b1c0fc3 fix refresh of hold action 2015-10-14 09:31:29 -07:00
Seth Alves
698a4001a8 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-14 06:18:02 -07:00
Brad Davis
0c31fb1b1b Merge pull request #6069 from ZappoMan/controllers 
Hack in NewControllers into the JS layer of interface to allow testing
 2015-10-13 19:08:26 -07:00
ericrius1
8e21999e44 erasing board 2015-10-13 16:54:37 -07:00
ericrius1
e42bbbc10d Adding erase board feature to whiteboard 2015-10-13 16:41:05 -07:00
ericrius1
2c8b85bb5c Displaying overlay laser pointer, user must past threshold to paint 2015-10-13 16:13:24 -07:00
ericrius1
4c877e8204 Changing color when grabbing colored boxes 2015-10-13 15:46:10 -07:00
ericrius1
b54b488b9e Adding in color selecting 2015-10-13 15:23:02 -07:00
ericrius1
a3f948acf8 Adding entity script to each color box 2015-10-13 15:00:38 -07:00
Seth Alves
755b971906 tweak 2015-10-13 14:31:52 -07:00
ericrius1
ad61b89abd setting up colors, adding some functions to utils.js 2015-10-13 14:16:28 -07:00
ericrius1
b490f9e2c1 Drawing line width based on trigger squeeze 2015-10-13 13:33:24 -07:00
ericrius1
470c8f7ef8 Painting on whiteboard with no judder 2015-10-13 11:31:56 -07:00
James B. Pollack
0f2ad8dd49 Merge branch 'wall_targets_2' into invert_solids 2015-10-13 10:15:48 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Ryan Huffman
9a9bdbbc44 hack in mappings to interface 2015-10-12 17:59:58 -07:00
ericrius1
04f0d792bb Reverted grab back to 5 hz 2015-10-12 17:36:53 -07:00
ericrius1
33ff21f376 Got rid of debug message in handControllerGrab script 2015-10-12 17:36:07 -07:00
ericrius1
fb040426eb added explanatory comment 2015-10-12 17:34:50 -07:00
ericrius1
f93b1d3325 Correctly whitelisting entities for ray picking 2015-10-12 17:05:34 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00
Seth Alves
f0ce698d78 switch back to springy grab 2015-10-12 16:57:20 -07:00
James B. Pollack
47471e837f reset targets once they have stopped moving 2015-10-12 16:31:36 -07:00
ericrius1
8d39f9c760 Syntax fixes 2015-10-12 15:02:03 -07:00
James B. Pollack
84f0c404ad fix bug related to camera lock for entity orbit and pan 2015-10-12 14:55:52 -07:00
ericrius1
d01dda9c81 Adding in functionality to include only specified Ids in ray picking 2015-10-12 14:40:11 -07:00
ericrius1
8dddf0e17a Added findRayIntersection, and confirmed judder grew a lot worse 2015-10-12 11:15:04 -07:00
ericrius1
96fd634138 Pre- ray cast 2015-10-12 11:02:47 -07:00
ericrius1
56a2aa101c baseline judder test for whiteboard painting- pre entity ray test 2015-10-12 10:44:18 -07:00
ericrius1
fb4aad1f32 adding whiteboard 2015-10-12 10:11:46 -07:00
Thijs Wenker
a6da91ee35 Fix walk.js script 2015-10-12 19:03:34 +02:00
Brad Davis
8024d9f017 Merge pull request #6055 from ZappoMan/newControllerInterface 
implement StandardController and expose it to JS as Controller.Standard.*
 2015-10-11 16:10:42 -07:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Brad Hefta-Gaub
e09fe30f05 damn you visual studio 2015-10-11 14:02:33 -07:00
Brad Hefta-Gaub
b5b4c2153a temp fix to get editing working again 2015-10-11 14:00:35 -07:00
Brad Hefta-Gaub
83bf8c8742 Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:43:07 -07:00
Brad Hefta-Gaub
b7b2c30eaa Merge pull request #6049 from sethalves/less-picky 
grab script picks less
 2015-10-10 09:41:49 -07:00
Seth Alves
5c95306e8e merge from upstream 2015-10-10 09:34:13 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop 
Asset file drop
 2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Seth Alves
7824d03e11 grab script picks 5x per second rather than 60x 2015-10-09 17:56:32 -07:00
Seth Alves
c6c44e8b81 add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held. 2015-10-09 15:42:30 -07:00
Atlante45
75f0a6442f ModelEntities spawned with no dimension autoresize 2015-10-09 12:23:19 -07:00
James B. Pollack
3e2b32530a Update pingPongGun.js 
Gun force shouldn't be so low.
 2015-10-09 10:47:20 -07:00
James B. Pollack
1332b8bef6 remove logging 2015-10-08 17:58:58 -07:00
James B. Pollack
772ea16c71 cleanup 2015-10-08 17:52:33 -07:00
James B. Pollack
ad6fdc813f alignment, targets, sounds, master script 2015-10-08 17:50:41 -07:00
James B. Pollack
62728aa507 alignments 2015-10-08 16:16:11 -07:00
James B. Pollack
d77abc2aba Merge branch 'wall_targets' of https://github.com/imgntn/hifi into wall_targets 2015-10-08 14:08:09 -07:00
James B. Pollack
b1db1db6da Merge remote-tracking branch 'upstream/master' into wall_targets 2015-10-08 14:06:23 -07:00
Ryan Huffman
26c40adecb Merge pull request #6023 from ZappoMan/animationGroupSettings 
Fixes to isEmitting for ParticleEffects
 2015-10-08 12:24:36 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
ericrius1
6921e0f022 Aligned targets on wall in toybox 2015-10-08 11:38:02 -07:00
Brad Hefta-Gaub
9f0721c08b Merge pull request #6020 from ericrius1/grabFarNonColliding 
Added grab far events for non physical objects
 2015-10-08 09:56:22 -07:00
ericrius1
aac372cc8a Fixed styling errors 2015-10-08 09:53:06 -07:00
Brad Hefta-Gaub
39f2241eac fix coding standard issue 2015-10-08 09:46:43 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
James B. Pollack
7a7b16f0a2 wall targets 2015-10-07 18:16:58 -07:00
ericrius1
efc2dfb68f Added grab far events for non physical objects 2015-10-07 18:06:37 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
Eric Levin
f01d4dde42 Merge pull request #6003 from imgntn/basketball_rack 
[Scripts] Basketball rack
 2015-10-07 10:59:20 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
James B. Pollack
7aab34975f code quality 2015-10-06 17:08:51 -07:00
Brad Hefta-Gaub
34fa5b43fc Merge pull request #5991 from imgntn/knockover_blocks 
[Scripts] Test Block Spawner for Blockers Game
 2015-10-06 17:03:29 -07:00
Brad Hefta-Gaub
0e5f4bc4c9 Merge pull request #5983 from ericrius1/lightFixes 
Light fixes in toybox
 2015-10-06 17:02:17 -07:00
James B. Pollack
4788480186 reset balls if they move too far 2015-10-06 16:48:34 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Atlante45
76e0006732 Remove forgotten cursorVisible 2015-10-06 15:58:35 -07:00
Brad Hefta-Gaub
be79101a93 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-06 15:20:37 -07:00
James B. Pollack
cda1b418ae cleanup 2015-10-06 11:29:41 -07:00
James B. Pollack
5f2112b8a5 finish rack and add to master script, reorganize all bball related scripts 2015-10-06 11:28:36 -07:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Eric Levin
0afaf84e2a Merge pull request #5979 from imgntn/ping_pong_gun 
[Script] Updates to Ping Pong Gun
 2015-10-06 09:47:53 -07:00
James B. Pollack
152fdb8112 physical rack 2015-10-06 09:44:00 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
James B. Pollack
6cc3077d67 end of day 2015-10-05 18:29:35 -07:00
James B. Pollack
1b241ea05e Update createTestBlocks.js 2015-10-05 18:13:51 -07:00
James B. Pollack
41b2f82be5 midway 2015-10-05 17:43:44 -07:00
Brad Hefta-Gaub
a554f3afb7 Merge pull request #5996 from cozza13/20701 
CR for Job #20701 - Create a menu for HMD stereo and mono eye switching/
 2015-10-05 17:22:36 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Chris Collins
c0a881ec52 added the correct call 
added the correct call
 2015-10-05 15:37:04 -07:00
Chris Collins
1e01d6bd8f Add the ability to switch between mono and stereo in HMD 
Add the ability to switch between mono and stereo in HMD
 2015-10-05 15:30:53 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Seth Alves
7f8411d947 reference count grabs on an entity 2015-10-05 14:15:38 -07:00
James B. Pollack
daf97b0b9d header fixes 2015-10-05 14:12:18 -07:00
James B. Pollack
839301bf05 remove cleanup to make blocks persistent 2015-10-05 13:41:20 -07:00
Seth Alves
635c83dad1 reset gravity and ignore-for-collisions after grabs have released 2015-10-05 13:39:01 -07:00
James B. Pollack
e528125af2 add test blocks for blockers game 2015-10-05 13:38:48 -07:00
James B. Pollack
43f69a0be9 initial knockover blocks 2015-10-05 13:23:19 -07:00
James B. Pollack
1ba31a840a Merge branch 'master' into knockover_blocks 2015-10-05 13:09:15 -07:00
Seth Alves
7f84e882c5 attempt to keep ignoreForCollisions the same before and after grab 2015-10-05 13:06:39 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
James B. Pollack
65ae811c9c make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script 2015-10-05 11:16:55 -07:00
James B. Pollack
588a256304 Merge branch 'master' into ping_pong_gun 2015-10-05 10:54:21 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
ZappoMan
6f86b0f550 particle fixes 2015-10-04 15:23:17 -07:00
Brad Hefta-Gaub
accdd8c86a add animation properties to edit properties 2015-10-02 19:15:24 -07:00
Seth Alves
a42bb5f533 Merge pull request #5981 from ericrius1/sprayCanFix 
No longer removing non-existent entities from spray paint can; color …
 2015-10-02 17:56:51 -07:00
Seth Alves
26310d8ce4 kill gravity in near-held objects 2015-10-02 17:54:09 -07:00
Brad Hefta-Gaub
abdd9a6da4 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 17:28:06 -07:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
ericrius1
38a66bc915 syntax fixes 2015-10-02 16:53:13 -07:00
Howard Stearns
a5a7c16466 Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment 
edit.js adjustment
 2015-10-02 16:28:54 -07:00
ericrius1
1ac1fcaf69 Light switches work properly now; no extra lights 2015-10-02 16:17:54 -07:00
ericrius1
e6e60e5e7a Lights should now only be created once at start of running reset master script, no matter how many people there are in the room 2015-10-02 15:58:32 -07:00
James Pollack
1ff5f11e29 merge 2015-10-02 15:56:39 -07:00
James Pollack
9427ba1a5a ping pong gun 2015-10-02 15:56:26 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Seth Alves
a737b4024d Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes 2015-10-02 13:57:24 -07:00
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub
328467e019 Merge pull request #5909 from imgntn/particle_explorer 
[Scripts] Particle Explorer
 2015-10-02 12:40:36 -07:00
ericrius1
0497de47ea No longer removing non-existent entities from spray paint can; color tweaks to paint stream 2015-10-02 12:40:14 -07:00
James Pollack
1c6e833028 cleanup weird function formatting, remove unused code, improve spacing for logical units 2015-10-02 12:31:55 -07:00
Seth Alves
c0e8b02a2f fix what happens when a distance grab is blocked because someone else already has it 2015-10-02 12:25:34 -07:00
Brad Hefta-Gaub
9bb2ada0a7 Merge pull request #5964 from ericrius1/sprayPaint 
Added closePaint script and removed no longer used spray paint scripts
 2015-10-02 12:21:00 -07:00
ericrius1
4b62048fb1 more light changes 2015-10-02 12:12:36 -07:00
Seth Alves
880d92ee64 try to fix double-distance-grabbing lockout 2015-10-02 11:46:48 -07:00
Seth Alves
5b970e6b1a try to fix double-distance-grabbing lockout 2015-10-02 11:43:19 -07:00
ericrius1
0d599458e6 Merged from toybox 2015-10-02 11:34:07 -07:00
James Pollack
55178cdc91 Merge remote-tracking branch 'upstream/master' into particle_explorer 2015-10-02 11:31:14 -07:00
James Pollack
2533bfd2ad initial 2015-10-02 11:30:56 -07:00
Brad Hefta-Gaub
5a0ff4b1a2 Merge pull request #5841 from ericrius1/toybox 
Toybox master reset script
 2015-10-02 11:27:43 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -07:00
ericrius1
4dd2cf9cf5 Moved master reset script into new directory called unpublished scripts and changed relative pathing 2015-10-02 11:09:43 -07:00
ericrius1
51887a76e1 refactoring lights to fix problem with piling up 2015-10-02 11:02:19 -07:00
James Pollack
c6fa132dc2 cleanup 2015-10-02 10:44:26 -07:00
James Pollack
82828fdd14 reduce gravity and gun force so ball goes through less objects 2015-10-02 10:41:49 -07:00
James Pollack
d1cbcf5554 roll back to full width window and set a min for emitRate so interface doesnt crash 2015-10-02 10:32:08 -07:00
ericrius1
f6c888599e Fixed a bug where particles weren't moving with can. 2015-10-02 10:22:48 -07:00
James Pollack
ea20fc9786 hack for it to work as a tool window 2015-10-02 10:08:10 -07:00
ericrius1
9f5a3066b8 changed masterResetEntity back to masterReset 2015-10-02 10:07:43 -07:00
ericrius1
71fe9b216c Removed extraneous masterReset script, and extra call to lightSwitches in correct script 2015-10-02 10:02:28 -07:00
ericrius1
a6df6c53f1 fixed more syntax errors 2015-10-02 09:55:41 -07:00
ericrius1
36f7bba87e Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing 2015-10-02 09:53:30 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
James B. Pollack
7c9d7ffefd single sysytem particle explorer with one way bindings is feature complete 2015-10-01 23:49:33 -07:00
James B. Pollack
d1432c51d5 Merge branch 'master' into particle_explorer 2015-10-01 21:21:52 -07:00
James Pollack
4b1b53e189 end of dat 2015-10-01 19:01:10 -07:00
James B. Pollack
a3c91b12b9 Update cat.js 2015-10-01 18:56:38 -07:00
James B. Pollack
0ce6a305bd Update cat.js 2015-10-01 18:52:08 -07:00
James Pollack
6131875f67 set whichhand to null on release 2015-10-01 18:49:07 -07:00
James B. Pollack
d0e079ee9d Update cat.js 
add globals, lint the code
 2015-10-01 18:46:32 -07:00
James B. Pollack
55d20e9d4c Update cat.js 2015-10-01 18:41:24 -07:00
James B. Pollack
59c1c7ee6a Update masterReset.js 
remove file versioning
 2015-10-01 18:40:12 -07:00
James B. Pollack
f200fcdfa2 Update cat.js 2015-10-01 18:35:34 -07:00
James B. Pollack
6cc2df9052 Update cat.js 
hook into isPlaying for sounds
 2015-10-01 18:34:22 -07:00
James B. Pollack
3565d96ffb Update sprayPaintCan.js 
add a header, cleanup
 2015-10-01 18:21:15 -07:00
James B. Pollack
54a51e6b8b Update and rename masterResetEntity.js to masterReset.js 
remove reference to 'entities' in the file name since this script does more than that.  also update the header file.
 2015-10-01 18:19:36 -07:00
James B. Pollack
6523a057a8 Update lightSwitchHall.js 
fix header file
 2015-10-01 18:18:27 -07:00
James B. Pollack
cfb9728fdb Update doll.js 
remove some unused code
 2015-10-01 18:17:35 -07:00
James B. Pollack
9098585e2f Update cat.js 
remove a lot of unused code and add flag for whether cat is already meowing so that it doesn't start another one until its done.  unfortunately i dont know how to read the audio isplaying state so we have to use a lame timeout
 2015-10-01 18:14:08 -07:00
James B. Pollack
b352ab4736 Update lightSwitchGarage.js 
fix header and spacing issues
 2015-10-01 18:04:37 -07:00
James Pollack
7f841b3828 prevent most other-hand accidental firing 2015-10-01 17:55:47 -07:00
ericrius1
d0be47bae9 fix merge 2015-10-01 17:22:12 -07:00
ericrius1
bf9a948ca9 Merge branch 'master' into toybox 2015-10-01 17:17:12 -07:00
ericrius1
407b6b8158 Fixed bug in spray paint where sometimes would not spray 2015-10-01 16:10:29 -07:00
ericrius1
0fb51a6777 got rid of unneeded light test code 2015-10-01 15:56:16 -07:00
ericrius1
cdb249c6ff original master script 2015-10-01 15:53:28 -07:00
James Pollack
32d9dc72d2 Merge branch 'master' into particle_explorer 2015-10-01 15:52:49 -07:00
ericrius1
25e25726d5 only lights 2015-10-01 15:43:25 -07:00
James Pollack
dfab1fc685 Fix merge conflicts and lint the conflict code 2015-10-01 15:32:22 -07:00
James Pollack
8e2c1a6b17 Add ping pong ball gun, add basketball hoop, reduce gate gravity, lint code 2015-10-01 15:22:45 -07:00
ericrius1
e1b720d338 Moved some functions to utils, fixed formatting 2015-10-01 15:18:44 -07:00
Seth Alves
716ebf487f Merge pull request #5952 from imgntn/ping_pong_gun 
[Scripts] Ping Pong Gun
 2015-10-01 15:06:48 -07:00
James B. Pollack
4a7e3c66bd Update createPingPongGun.js 
use relative paths
 2015-10-01 15:05:25 -07:00
James Pollack
7bcb4e4ae3 Merge branch 'master' into ericrius1-toybox 2015-10-01 14:59:54 -07:00
ericrius1
55c6b9d9c4 Added collision sound to blocks 2015-10-01 14:57:03 -07:00
Brad Hefta-Gaub
5e8e15091a Merge pull request #5970 from sethalves/allow-double-near-grab 
allow more than one near-grab on an object
 2015-10-01 14:47:03 -07:00
ericrius1
5aef7475d6 Sound position updates every frame based on new position of can 2015-10-01 14:42:51 -07:00
Brad Hefta-Gaub
a2463cbf68 Merge pull request #5972 from Atlante45/fix_currentAPI 
Fix currentAPI.js
 2015-10-01 14:41:56 -07:00
Brad Hefta-Gaub
17402c697a Merge pull request #5935 from imgntn/basketball_hoop 
[Scripts] Basketball hoop
 2015-10-01 14:40:55 -07:00
ericrius1
7ee26c5d4a tweaked settings 2015-10-01 14:26:22 -07:00
James Pollack
861aa91572 shoot out of the right end of the gun 2015-10-01 12:27:45 -07:00
James Pollack
d2f4b6e9f0 add / remove controller listener methods 2015-10-01 12:21:56 -07:00
ericrius1
290659b9f6 increased lifetime 2015-10-01 11:46:37 -07:00
James Pollack
a4105eb321 add color pickers 2015-10-01 11:34:02 -07:00
Atlante45
d0bec38603 Fix currentAPI.js 2015-10-01 11:30:50 -07:00
Brad Hefta-Gaub
aca25bd76e connect up AnimationPropertyGroup to AnimationLoop 2015-10-01 11:05:16 -07:00
ericrius1
ef5ad9eeb3 Laser stays visible when further away from surfaces 2015-10-01 11:02:22 -07:00
Seth Alves
2700529b33 lower action lifetime 2015-10-01 10:41:43 -07:00
Seth Alves
d4f954a0e2 allow more than one near-grab on an object 2015-10-01 10:25:30 -07:00
ericrius1
191a4740a3 laser color matches paint color 2015-10-01 09:50:58 -07:00
ericrius1
2899962d43 can now cycle colors with 4 and 2 buttons on hydra 2015-09-30 17:14:17 -07:00
ericrius1
3592b78b2b less points per line 2015-09-30 16:35:43 -07:00
ericrius1
e516281da8 Added closePaint script and removed no longer used spray paint scripts 2015-09-30 16:15:52 -07:00
James Pollack
c55d627e9b Different model, different sounds, release interval 2015-09-30 16:12:27 -07:00
Seth Alves
91965db5ab increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:07:22 -07:00
Seth Alves
cd2a1542e0 increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:05:16 -07:00
Seth Alves
4e057e5ada increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:03:54 -07:00
James Pollack
3cdb4e7186 importing 2015-09-30 14:23:11 -07:00
Seth Alves
dd0a16df04 don't leave search state if we intersect something that someone else is already grabbing 2015-09-30 14:19:59 -07:00
Seth Alves
b417abc3de try again on string startswith 2015-09-30 14:16:07 -07:00
Seth Alves
c27766facb move string startswith to utils.js 2015-09-30 14:07:23 -07:00
Seth Alves
f746a970de don't grab something if someone else is already grabbing it 2015-09-30 14:03:10 -07:00
Seth Alves
b34ea6ded4 store action lifetime as an expires integer 2015-09-30 13:46:23 -07:00
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
James Pollack
8fc696c5f8 add ability to explort particle settings in nice format for interface 2015-09-30 12:41:08 -07:00
James Pollack
57d5418231 export just particle settings in interface compatible format 2015-09-30 12:27:51 -07:00
James Pollack
0865f94106 magic numbers 2015-09-30 11:31:33 -07:00
James Pollack
8bdf428f41 First version of ping pong gun 2015-09-30 11:21:51 -07:00
ericrius1
c03a9ddd58 Added fire to master script 2015-09-30 11:14:18 -07:00
James Pollack
ecad7f34f6 moar 2015-09-30 10:58:21 -07:00
Seth Alves
898e3917e3 improve actionInspector.js 2015-09-30 10:57:52 -07:00
James Pollack
99fbed6143 mostly working 2015-09-30 10:49:47 -07:00
Seth Alves
96d0df49e4 script to display entity-action details in an overlay 2015-09-30 10:41:39 -07:00
James Pollack
c3dfea4712 initial files 2015-09-30 10:26:24 -07:00
ericrius1
2b84c90f9d merged master hand controller 2015-09-30 10:18:13 -07:00
James B. Pollack
402fd44cff header file cleanup 2015-09-29 21:27:55 -07:00
James B. Pollack
80a457eb14 cleanup the main.js file for distribution 2015-09-29 19:47:00 -07:00
James B. Pollack
47b410df93 version 0.1 of particle explorer for distribution 2015-09-29 19:44:15 -07:00
ericrius1
00cab85a11 Removed whiteboard from reset script 2015-09-29 18:33:31 -07:00
ericrius1
259391a40b Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 18:32:56 -07:00
ericrius1
ba17225c19 Remove hand control script from PR 2015-09-29 18:32:52 -07:00
James Pollack
d4cc3994f4 add some 2 way bindings for settings sanity check 2015-09-29 17:47:41 -07:00
Eric Levin
68615e171a Update masterResetEntity.js 2015-09-29 17:40:05 -07:00
James Pollack
d0f20bfa63 working particle explorer w00t! 2015-09-29 17:01:10 -07:00
Brad Davis
166d267022 Merge pull request #5942 from ZappoMan/flickeringLightScript 
Change the update rate of the flickering light to 30hz
 2015-09-29 16:20:24 -07:00
Seth Alves
472ff89f48 rearrange when avatar collisions are adjusted 2015-09-29 15:52:38 -07:00
Brad Hefta-Gaub
67823b79d5 change additional lifetime to 60 seconds to avoid processing hiccups 2015-09-29 15:48:46 -07:00
Brad Hefta-Gaub
90afeb4ce1 more debugging 2015-09-29 15:45:29 -07:00
ericrius1
d8e7da7b73 added painting to whiteboard 2015-09-29 15:43:59 -07:00
ericrius1
648fb7cb8c Merge branch 'master' into toybox 2015-09-29 15:40:46 -07:00
Seth Alves
8f2f14c9e5 keep track of state of avatar-collisions menu-item with global variables rather than per object ones 2015-09-29 15:30:24 -07:00
Seth Alves
2ba686ed89 cleanups 2015-09-29 15:11:52 -07:00
Seth Alves
d554eb8db9 avatar collisions are off during a grab 2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub
f83eae4d42 more debugging 2015-09-29 14:45:24 -07:00
Seth Alves
b1a133e55c working on disabling avatar collisions during grab 2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub
07515ce710 Merge pull request #5918 from PhilipRosedale/master 
Throw held objects with velocity from fingertip
 2015-09-29 14:37:44 -07:00
unknown
006650f23b Fix for PR comments 2015-09-29 14:34:23 -07:00
James Pollack
b9a83be4d3 cleanup 2015-09-29 14:31:13 -07:00
James B. Pollack
bbc32cdd1e Merge pull request #5937 from ericrius1/grabFix 
releaseGrab event now triggered for non physical entities
 2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
ericrius1
7681d8d77d fixed commenting 2015-09-29 14:05:57 -07:00
ericrius1
644687f330 releaseGrab event now triggered for non physical entities 2015-09-29 14:04:03 -07:00
Seth Alves
e9dd165b1d try calling updateMotionBehaviorFromMenu 2015-09-29 14:00:22 -07:00
ericrius1
a1f922721a Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 13:57:20 -07:00
ericrius1
81c5d0c388 more whiteboard work 2015-09-29 13:57:17 -07:00
Seth Alves
f7b34f63c1 try calling updateMotionBehaviorFromMenu 2015-09-29 13:40:54 -07:00
Brad Hefta-Gaub
6a01c10453 more debug 2015-09-29 13:35:16 -07:00
Brad Hefta-Gaub
9c199b23a2 more debug 2015-09-29 13:32:28 -07:00
Brad Hefta-Gaub
4abb251728 more debug 2015-09-29 13:28:45 -07:00
James Pollack
cbd55ddba6 Add the hoop 2015-09-29 13:24:49 -07:00
Seth Alves
49da3c5034 disable avatar collisions while holding something 2015-09-29 13:24:03 -07:00
James B. Pollack
3bbc809710 Merge pull request #5930 from ericrius1/grabFix 
Setting hand data for close grab of non physical objects
 2015-09-29 13:17:21 -07:00
James Pollack
26554c5ac3 whitespace 2015-09-29 13:13:50 -07:00
Brad Hefta-Gaub
fdb9455540 debug 2015-09-29 13:12:55 -07:00
James Pollack
e615c62bd3 Prevent mouse grab from grabbing ungrabbable objects 2015-09-29 13:11:39 -07:00
James B. Pollack
23c9ffa1aa Merge pull request #8 from imgntn/ericrius1-toybox 
Add fences to master script
 2015-09-29 13:06:45 -07:00
ericrius1
da16a6f55b fixed merge 2015-09-29 13:02:00 -07:00
James Pollack
c52cd30843 Merge branch 'master' into ericrius1-toybox 2015-09-29 13:01:59 -07:00
James Pollack
66ef92b659 thicker, heavier gates, wand collision shape 2015-09-29 12:52:34 -07:00
ericrius1
06194b6088 fixed formatting 2015-09-29 12:51:01 -07:00
Brad Hefta-Gaub
3cf7553c2a new flickering light script 2015-09-29 11:51:26 -07:00
James Pollack
a58cf66f2e wand adjustments 2015-09-29 11:07:21 -07:00
James Pollack
63c02712c1 add shape types 2015-09-29 10:52:54 -07:00
James Pollack
337909b539 actual model url 2015-09-29 10:47:32 -07:00
James Pollack
48290a5275 Merge remote-tracking branch 'upstream/master' into ericrius1-toybox 2015-09-29 10:42:32 -07:00
ericrius1
932f7ce92c up to date 2015-09-29 10:39:07 -07:00
ericrius1
35e4ec17ea add which hand for near grab of non physical objects 2015-09-29 10:35:38 -07:00
ericrius1
d07c93ef8f adds hand setting when grabbing near non physical objects 2015-09-29 10:22:03 -07:00
James Pollack
676c02c77e file updates 2015-09-29 10:19:39 -07:00
ericrius1
1662471583 whiteboard changes 2015-09-29 10:16:44 -07:00
James Pollack
1ceefc3c63 add model key and url 2015-09-29 10:00:45 -07:00
ericrius1
c4be6e2fb2 Merge branch 'master' into toybox 2015-09-29 09:47:13 -07:00
ericrius1
8857042363 whiteboard 2015-09-29 09:46:49 -07:00
ericrius1
80405450ce Paint can now just sprays out stream 2015-09-29 09:00:12 -07:00
James B. Pollack
4c86b1ce03 ballin 2015-09-28 18:47:32 -07:00
ericrius1
04d797e964 paint can 2015-09-28 17:59:42 -07:00
Eric Levin
e8e9957846 Merge pull request #5911 from ZappoMan/rayIntersectionWork 
adding surface normals to ray intersection
 2015-09-28 17:21:40 -07:00
ericrius1
3f83d5a99a Animation playing for doll, but looping 2015-09-28 17:14:35 -07:00
ericrius1
d47f938f8d blocks 2015-09-28 17:05:58 -07:00
ericrius1
afcd59a549 Moved cat to stool 2015-09-28 17:04:03 -07:00
ericrius1
a21530282b logging frame 2015-09-28 16:56:46 -07:00
ericrius1
5e28462e2a testing doll animation 2015-09-28 16:51:23 -07:00
unknown
56a0456f70 Adjust force multiplier and timestep 2015-09-28 16:49:55 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f Merge pull request #5921 from huffman/import-export-fix 
Import/Export entities fix
 2015-09-28 16:21:18 -07:00
unknown
5c7cf76035 Distance grab works with walking and turning 2015-09-28 16:13:35 -07:00
James Pollack
f79414649e add gravity to fences 2015-09-28 15:57:53 -07:00
James Pollack
09a53d553a Add fences to Toybox master script, add gravity to bubble wand 2015-09-28 15:55:25 -07:00
Ryan Huffman
42c33ba699 Fix edit.js import on Windows 
Forcefully prepend "file:///" to the local file url used for importing
 2015-09-28 15:40:37 -07:00
James Pollack
7ce086396c Merge branch 'master' into ericrius1-toybox 2015-09-28 15:31:03 -07:00
James Pollack
afa179b9c4 hoop 2015-09-28 15:08:48 -07:00
unknown
5fc7965042 Throw held objects with velocity from fingertip 2015-09-28 13:04:58 -07:00
Brad Hefta-Gaub
ae73a7e97f Merge pull request #5904 from imgntn/grab_updates_1 
[Scripts] Add ability for entities to declare themselves ungrabbable
 2015-09-28 12:55:51 -07:00
James Pollack
ade78fda9e balls 2015-09-28 12:24:21 -07:00
ericrius1
45281f8aae modified spraypaint can to spray out particles but no paint 2015-09-28 10:34:03 -07:00
ericrius1
660490d754 removed magBalls 2015-09-28 10:29:12 -07:00
James B. Pollack
affb0253db Update handControllerGrab.js 
added a semicolon to the end of a return statement
 2015-09-28 10:26:52 -07:00
James Pollack
02aa6ca6d1 constant updates 2015-09-28 10:21:02 -07:00
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