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

944 commits

Author SHA1 Message Date
Atlante45
0b31971592 Update joints list everytime I try to attach 2014-05-30 10:42:54 -07:00
Brad Hefta-Gaub
c3b87504d9 Merge pull request #2957 from Atlante45/fix_for_editModel 
Fixed JS parse error
 2014-05-30 10:24:54 -07:00
Atlante45
a7f10798b2 Fixed JS parse error 2014-05-30 10:23:36 -07:00
barnold1953
06a9ac22e7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 09:26:07 -07:00
Philip Rosedale
169e7d61fd Merge pull request #2954 from ctrlaltdavid/19715 
Code Review for Job #19715
 2014-05-29 20:03:24 -07:00
Atlante45
17e3bd6110 CR comments 2014-05-29 18:24:21 -07:00
Atlante45
b89d0a292c code cleanup 2014-05-29 15:56:46 -07:00
Atlante45
fd0c195132 Code cleanup 2014-05-29 15:55:17 -07:00
Atlante45
c7b636365c Don't attach to joints in range when I grab 2014-05-29 15:50:23 -07:00
Atlante45
3e207f9452 fixed display error in editVoxels with new boundaries 2014-05-29 15:09:42 -07:00
Atlante45
980e873a13 Better prints in editModels 2014-05-29 15:02:09 -07:00
barnold1953
133593edd5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-29 14:51:23 -07:00
Atlante45
b34453647b editModels click/drag/attach tweaks 2014-05-29 14:34:10 -07:00
David Rowe
bd4d167684 Make JavaScript audio samples able to be looped 
Add a "loop" property to AudioInjectorOptions and provide an example JavaScript file.
 2014-05-29 14:13:02 -07:00
barnold1953
055a62e7e5 Replaced nonfunctioning particleBird.js with awesome particleBirds.js 2014-05-29 11:48:15 -07:00
Atlante45
37613f086b Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-05-29 10:28:09 -07:00
AndrewMeadows
6f2e481638 Merge pull request #2948 from huffman/19728 
Code Review for Job #19728
 2014-05-29 08:59:00 -07:00
Philip Rosedale
79405444d1 Merge pull request #2947 from PhilipRosedale/master 
Set max voxel size of 16 meters in script for voxel creation
 2014-05-28 21:05:23 -07:00
Philip Rosedale
e0d68607cd Set max voxel size of 16 meters in script for voxel creation 2014-05-28 21:02:33 -07:00
Ryan Huffman
cfe176c60e Add locationsMenu.js 2014-05-28 20:50:39 -07:00
Atlante45
372ddc92fd Added attaching of model to MyAvatar when close enough 2014-05-28 16:00:37 -07:00
ZappoMan
e3d880248f tweaks 2014-05-28 12:03:40 -07:00
ZappoMan
0e7f3e0e37 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 10:37:28 -07:00
ZappoMan
6fd22856f2 hacking on non-AABox models 2014-05-28 10:24:02 -07:00
Philip Rosedale
8d7e682a1f Merge pull request #2937 from huffman/19714 
Code Review for Job #19714
 2014-05-27 20:20:45 -07:00
Atlante45
285bd0d2f2 Switched to findRayIntersection 2014-05-27 15:50:39 -07:00
Ryan Huffman
ca6cc86ca1 Add playSoundWave.js 2014-05-27 11:35:00 -07:00
Brad Hefta-Gaub
517d51cba7 Merge pull request #2928 from PhilipRosedale/master 
Improved playSound.js to work without a spatial controller
 2014-05-27 11:04:25 -07:00
Philip Rosedale
ab80e3dc84 improved playSound.js to work if no spatial controller attached 2014-05-27 10:32:55 -07:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube 
Add RayPick support for models
 2014-05-24 17:03:59 -07:00
ZappoMan
efd0580cfb add ray picking to the model scripting interface 2014-05-23 17:09:37 -07:00
Philip Rosedale
d341e7314d squared force on thrust controller 2014-05-23 16:25:19 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
Atlante45
37a939588f Mode sure the closest model is always selected 2014-05-23 11:28:48 -07:00
Atlante45
53141ff1c1 Glow when grabbed with the mouse (for now) 2014-05-23 11:10:56 -07:00
wangyix
a6d0384c3b Merge remote-tracking branch 'upstream/master' 2014-05-23 10:08:46 -07:00
Philip Rosedale
22548b9956 Merge pull request #2909 from PhilipRosedale/master 
add visual indicator of thrust direction
 2014-05-23 09:58:55 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00
AndrewMeadows
18046c9e9a Merge pull request #2907 from PhilipRosedale/master 
Velocity damped hand positions
 2014-05-23 09:50:39 -07:00
wangyix
645002493f Merge remote-tracking branch 'upstream/master' 2014-05-23 09:48:05 -07:00
wangyix
2dd78b36db moved _sequenceNumber to OctreeSendThread 2014-05-23 09:47:08 -07:00
Philip Rosedale
2681312b54 Velocity damped hand positions 2014-05-23 00:09:15 -07:00
ZappoMan
519f5539d9 also support deleting mouse selected model 2014-05-22 14:37:34 -07:00
ZappoMan
b5056dcd3a fix broken mouse edit 2014-05-22 13:01:02 -07:00
ZappoMan
66b9d582a8 fix broken mouse edit 2014-05-22 12:43:23 -07:00
ZappoMan
b9e73a6ef7 added delete support to edit models 2014-05-22 12:23:01 -07:00
Philip Rosedale
5c564cb2cb Added FWD button as grab controller (so PrioVR will work) 2014-05-22 09:55:08 -07:00
Philip Rosedale
f0a1d2a172 Move with grab button 2014-05-22 07:24:30 -07:00
Brad Hefta-Gaub
0c3f574302 Merge pull request #2890 from Atlante45/no_voxel_tool_selected 
Made voxelTools unselected by default to avoid accidental voxelEdit at l...
 2014-05-21 11:01:31 -07:00
Atlante45
9b3b5201c9 Made voxelTools unselected by default to avoid accidental voxelEdit at login 2014-05-21 10:39:26 -07:00
Brad Hefta-Gaub
6bb4664611 Merge pull request #2884 from polac/19521 
Code Review for Job #19521
 2014-05-20 17:02:30 -07:00
ZappoMan
b228da34a5 slight DRY 2014-05-18 20:43:27 -07:00
ZappoMan
31ae7ceaff added isLocked() to lock the ground plane in hq 2014-05-18 20:31:55 -07:00
Mika Impola
cc1bd5d63b Fixed cropping of the image. 2014-05-17 21:24:29 +03:00
Mika Impola
fd3e871242 Updating button position when window is resized. 2014-05-17 21:04:27 +03:00
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Philip Rosedale
5dcd942e8e removed dead code 2014-05-16 09:44:03 -07:00
Philip Rosedale
4532c93419 debug off 2014-05-16 09:36:55 -07:00
Philip Rosedale
25f1e180f5 revert test change 2014-05-16 09:34:54 -07:00
Philip Rosedale
85b94ff71c added dead zone to pitch in hydra move, animated models show up where you are 2014-05-16 09:20:15 -07:00
Philip Rosedale
ad4556ab56 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-15 21:58:09 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Mika Impola
aac73c3665 Script to make your avatar sit down. 2014-05-15 21:44:45 +03:00
Philip Rosedale
951109594e Merge branch 'master' of https://github.com/worklist/hifi 2014-05-15 09:29:01 -07:00
Philip Rosedale
ca6571188c Merge branch 'master' of https://github.com/worklist/hifi 2014-05-14 14:02:17 -07:00
ZappoMan
0a8dc78c96 tweaks to animation script example 2014-05-14 13:08:32 -07:00
ZappoMan
7c44162209 animated model example 2014-05-14 13:00:35 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Atlante45
53d7aeab4f Fixed typo 2014-05-14 12:02:38 -07:00
Philip Rosedale
4732cbb575 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-14 11:54:17 -07:00
Philip Rosedale
394985ef45 Switched to Halo gun in gun.js, work in progress on hydraMove to add flying 2014-05-14 11:52:01 -07:00
Atlante45
4f93858849 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-14 10:41:29 -07:00
Atlante45
5ef71d6a35 Full mouse handling 2014-05-14 10:40:50 -07:00
Ryan Huffman
dca555a8d4 Merge branch 'master' of git://github.com/highfidelity/hifi into 19614 2014-05-14 09:58:59 -07:00
Ryan Huffman
02676848c6 Fix order of components in streetAreaExample.js 2014-05-14 09:58:04 -07:00
Atlante45
624ae4732f Fixes to PickRay check 2014-05-13 14:58:34 -07:00
Atlante45
701bc63bd1 Removed old toolbar 2014-05-13 14:34:08 -07:00
Atlante45
c59358ac96 First cut at editModels with the mouse 2014-05-13 14:10:01 -07:00
ZappoMan
a56567a369 add support for adjustable FPS 2014-05-13 09:27:31 -07:00
Atlante45
37700c6ad3 Fixed prompt size 2014-05-12 17:10:19 -07:00
Atlante45
261eefd05b Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-12 14:09:26 -07:00
ZappoMan
5309c5ad8b add more properties to animated models 2014-05-12 13:44:44 -07:00
ZappoMan
ed6f828b36 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-12 09:14:04 -07:00
Philip Rosedale
ea1bcd13a4 Updated guitar with more chords, key triggers 2014-05-09 17:39:03 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07:00
Atlante45
05283cd904 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-09 11:43:33 -07:00
Philip Rosedale
a7f44bf207 double fisted gun action 2014-05-09 00:16:11 -07:00
Philip Rosedale
4a1672957e guitar is now auto-attached 2014-05-08 23:23:44 -07:00
Philip Rosedale
95f6bcbbd6 finish air guitar, gun initial position on hand tweak 2014-05-08 22:54:35 -07:00
Atlante45
cd78be7d25 Some work on mouse tools for editModels.js 2014-05-08 16:47:18 -07:00
Andrzej Kapolka
c02b708ee5 Provide the option to avoid making duplicate attachments. 2014-05-08 15:54:30 -07:00
Brad Hefta-Gaub
9c54576aca Merge pull request #2814 from PhilipRosedale/master 
More arrow controls to move camera in mirror mode, new guitar chords
 2014-05-07 20:02:28 -07:00
Philip Rosedale
e6a8c79f9f Added more arrow controls to move camera when in mirror mode, new guitar chords. 2014-05-07 16:51:22 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Atlante45
31aedb4aa8 fixed overlay not moving on resize in editModels.js 2014-05-07 14:39:26 -07:00
Philip Rosedale
f6aaaad211 removed some unneeded stuff 2014-05-06 22:44:36 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Atlante45
9c9556914e Slow down hydra move 2014-05-06 17:03:19 -07:00
Atlante45
abebb078b0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-06 13:08:00 -07:00
Atlante45
61c2dd0468 Fixed orientation and offset issues 2014-05-06 13:07:31 -07:00
Ryan Huffman
5a7b133d25 Fix dates in XMLHttpRequest js files 2014-05-06 11:38:12 -07:00
Ryan Huffman
e191b8acb8 Merge remote-tracking branch 'upstream/master' into 19614 2014-05-06 11:32:38 -07:00
Ryan Huffman
39e6e61a6d Add XMLHttpRequest tests and examples 2014-05-06 11:31:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Brad Hefta-Gaub
e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia 
improved avatar walking on voxels
 2014-05-05 15:49:44 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
ZappoMan
ccadf3be57 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:39:36 -07:00
ZappoMan
3bb72c04a5 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:36:03 -07:00
ZappoMan
5aabd302fc tweaks to placeModelsWithHands 2014-05-05 12:35:49 -07:00
Atlante45
1ecf0e3b9d Used wrong formula in previous commit 2014-05-05 11:43:58 -07:00
Atlante45
7855bf8e24 Fix scale issue in editVoxels.js (closes #2776) 2014-05-05 11:35:50 -07:00
Atlante45
0b4516e09b editModels,js switched to use actual models instead of particles. 2014-05-02 15:32:29 -07:00
Atlante45
55ce204ee3 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 14:50:52 -07:00
ZappoMan
8443bb0afc fix a scale to fit bug, and add features to place models with hands 2014-05-02 13:19:33 -07:00
Atlante45
ab0a0165c7 Working version of editModels.js 2014-05-02 11:19:12 -07:00
Atlante45
4e88d66c95 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 10:17:11 -07:00
ZappoMan
cc091c0bc9 added sample 2014-05-02 09:39:29 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Andrew Meadows
b4d3df47fb Disable gravity on script start 2014-05-01 12:09:34 -07:00
Ryan Huffman
eccedda284 Add fileBrowserExample.js 2014-05-01 10:56:23 -07:00
ZappoMan
293963c546 implement snap to center in model 2014-05-01 09:02:41 -07:00
ZappoMan
bb6444f5a9 more hacking got it working 2014-05-01 07:30:56 -07:00
ZappoMan
85484affa9 hacking 2014-04-30 17:55:54 -07:00
Atlante45
8068a915aa More work on editModels 2014-04-30 16:50:40 -07:00
ZappoMan
3322d1f7ff example JS for models 2014-04-30 14:18:57 -07:00
Atlante45
8cad705e2d Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-30 11:13:07 -07:00
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
45beeaa8d5 Add dialog + location + window JS examples 2014-04-30 09:45:53 -07:00
ZappoMan
4aa96e1fbe added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock 2014-04-29 15:10:28 -07:00
Atlante45
827e64ec0a Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-29 14:56:36 -07:00
Atlante45
ef281e2a5f Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-29 11:01:57 -07:00
Andrew Meadows
2c7fcada3b make gravity transitions faster 2014-04-29 10:00:12 -07:00
Andrew Meadows
4937a0af2e add status button for local gravity 2014-04-28 17:29:44 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Atlante45
0457f2035d more editModels work 2014-04-28 14:02:09 -07:00
Andrew Meadows
ea2e96ac6f toggle collision and gravity with timers 2014-04-28 13:02:54 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Atlante45
2224025b38 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-25 16:42:09 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Andrew Meadows
39252a8339 swissArmyJetpack.js now toggles "obey gravity" 2014-04-25 14:17:39 -07:00
Andrew Meadows
afb12bcd70 add swissArmyJetpack.js 2014-04-24 19:12:23 -07:00
Atlante45
4927a77382 Some testing with editModels.js 2014-04-24 18:15:39 -07:00
Atlante45
9bdcfe6d04 Undo now fully support local subtrees 2014-04-24 11:01:12 -07:00
Thijs Wenker
ebc6f4e78e Removed UTF-8 new line characters, QT script errors on those lines in Windows. 2014-04-23 14:40:06 +02:00
ZappoMan
ae443a3136 fix headers 2014-04-22 11:27:50 -07:00
ZappoMan
a473fe3aee fix header 2014-04-21 15:14:14 -07:00
ZappoMan
ffc73e04eb added new load testing example script 2014-04-21 11:48:42 -07:00
Atlante45
178f845ad0 Rescale import when using keys +/- 2014-04-18 16:40:13 -07:00
Atlante45
7782e53363 Restored scale copy 2014-04-18 16:26:10 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
c4102e3af0 Improved scale selector, changed first swatch behaviours, improved placement tool 2014-04-18 16:04:20 -07:00
AndrewMeadows
aaac7ac82c Merge pull request #2688 from ey6es/master 
Added head translation for Faceplus.
 2014-04-18 13:45:00 -07:00
Stephen Birarda
e4d30c5f1f Update dancing_bot.js 
put gangnam style animation back - it's royalty free
 2014-04-18 10:57:50 -07:00
AndrewMeadows
a10aaa537e Merge pull request #2692 from ZappoMan/moonshot 
added wet/dry mix, and alternate distance attenuation features
 2014-04-18 10:34:55 -07:00
Atlante45
01fe3f45c5 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 2014-04-18 10:23:01 -07:00
Stephen Birarda
9713edbba9 Update dancing_bot.js 
conceal URL from dancing_bot script (even though it will stay in history)
 2014-04-18 09:00:43 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Andrzej Kapolka
828bedc3e8 Slight fix for dancing bot script. 2014-04-17 17:07:02 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Brad Hefta-Gaub
ad3bd75308 Merge pull request #2671 from Atlante45/random_sounds 
Random sounds
 2014-04-17 11:36:15 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
 2014-04-17 10:58:34 -07:00
Andrzej Kapolka
a6136b42ff Switch to a working (and more amusing) animation. 2014-04-17 10:55:11 -07:00
Atlante45
55a1cd27c5 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 2014-04-17 10:51:04 -07:00
Andrzej Kapolka
03c3952e52 Better joint mappings, switch to working (more or less) model. 2014-04-17 10:41:46 -07:00
Andrew Meadows
db717b980b merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-04-17 08:40:25 -07:00
Andrzej Kapolka
00829e0289 The actual animation business. 2014-04-16 21:10:59 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Atlante45
dcccd66c51 Changed sound files to raw 2014-04-16 17:49:35 -07:00
Atlante45
1c89d8f3ed editVoxels reformat 2014-04-16 17:33:15 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
Andrew Meadows
fe1123ea97 gun.js correctly deletes voxel again on collision 2014-04-16 14:22:47 -07:00
ZappoMan
67de87d114 added slider for local audio attenuation 2014-04-15 21:31:35 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
ZappoMan
f3f9325a42 fixed comment 2014-04-15 12:45:28 -07:00
Atlante45
c323249039 Remove bad change 2014-04-15 10:38:28 -07:00
Atlante45
08b24343e5 Added sounds provided by grayson and randomized their use. 2014-04-15 10:34:18 -07:00
ZappoMan
8a16986294 add sliders for reflection, diffusion, absorption 2014-04-15 09:58:35 -07:00
ZappoMan
839df97687 make audio sliders initialize to defaul starting points 2014-04-14 16:46:25 -07:00
ZappoMan
5e42daaa51 fix predelay in the diffusion case 2014-04-14 12:32:23 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
 2014-04-14 09:43:29 -07:00
ZappoMan
ddd2b0843c more work on new diffusion model 2014-04-13 20:43:40 -07:00
Andrew Meadows
f27f8e39c8 example JS for handling avatar collisions 2014-04-09 17:22:17 -07:00
Stephen Birarda
619e9d7cd3 more header repairs caught via find 2014-04-09 09:52:00 -07:00
Stephen Birarda
6ce5a24460 missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
Stephen Birarda
067ea5b5b6 add a missing space in company name in paintGun 2014-04-09 09:22:19 -07:00
Stephen Birarda
4a398494b1 ensure spacing in company name for JS licenses 2014-04-09 09:21:54 -07:00
Stephen Birarda
9950845566 more apache licensing tweaks to JS files 2014-04-09 09:19:29 -07:00
Stephen Birarda
0f204f932c add apache license information to more js files 2014-04-08 18:00:24 -07:00
Stephen Birarda
8ff244cc1a add missing space for example replace in javascripts 2014-04-08 17:58:02 -07:00
Stephen Birarda
71c3443614 mass replacement of js of hifi with examples 2014-04-08 17:56:56 -07:00
Stephen Birarda
5b822dc57c inital licensing fixes for JS headers 2014-04-08 17:54:54 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
db1a622040 Merge pull request #2612 from Atlante45/fix_editVoxels_inspect_conflict 
Fix for editVoxels/inspect conflict
 2014-04-08 07:24:51 -10:00
Atlante45
174f37f531 Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed Merge pull request #2615 from ey6es/master 
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
 2014-04-08 07:20:00 -10:00
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Atlante45
d213cd7840 More work on Undo/Redo 2014-04-07 17:10:15 -07:00
Atlante45
56b0583600 Fix for editVoxels/inspect conflict 2014-04-07 14:42:35 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
ZappoMan
d198b04daf lots of knobs and dials 2014-04-04 17:29:50 -07:00
Andrew Meadows
f6c98a1cc2 fix bug in gun.js: unplayed target delete sound 2014-04-04 10:40:55 -07:00
Philip Rosedale
3babb5e0bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-31 07:25:46 -07:00
Stephen Birarda
0c28907609 fix the hydraMove script to pull you based on head orientation, not body 2014-03-28 10:08:00 -07:00
Philip Rosedale
41e9017953 more audio level meter work, improved gun 2014-03-27 15:14:38 -07:00
Philip Rosedale
0b13a7173c disable wheel for size scaling 2014-03-26 23:24:36 -07:00
Philip Rosedale
ff8d154412 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 22:38:35 -07:00
Stephen Birarda
28f962ea2b fix for AudioMixer kill and re-add and no sound load in bot 2014-03-26 13:19:20 -07:00
Stephen Birarda
d61c5bb38b add two missing commas to bot script 2014-03-26 13:00:09 -07:00
Stephen Birarda
e9cbdbb904 cleanup sound loading in bot script 2014-03-26 12:57:10 -07:00
Philip Rosedale
5cce4b3c03 added more movement 2014-03-26 12:14:03 -07:00
Philip Rosedale
61bfc77c06 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-25 14:23:27 -07:00
ZappoMan
9a3533a38f added inspect.js to defaultScripts.js 2014-03-25 12:59:57 -07:00
ZappoMan
4df277829b Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-03-25 12:56:16 -07:00
ZappoMan
a256473ac5 fixed lookWithTouch.js to not reset 2014-03-25 12:55:50 -07:00
Philip Rosedale
70a26ff895 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-25 11:51:20 -07:00
Philip Rosedale
925f8241e5 adding joint animation 2014-03-25 11:48:46 -07:00
ZappoMan
d8bf5be68b fix audio position in editVoxles.js 2014-03-25 08:43:56 -07:00
ZappoMan
7b50e6d4ef added hydraMove.js to default scripts 2014-03-25 01:02:50 -07:00
ZappoMan
14fcbb01a6 Merge branch 'master' of https://github.com/worklist/hifi into scripting_improvements 2014-03-25 01:01:55 -07:00
ZappoMan
55622d5f23 add stub of default script 2014-03-25 00:46:07 -07:00
ZappoMan
a613da8032 add Script.include() 2014-03-24 21:25:59 -07:00
ZappoMan
547ea047e3 cleanup extra debug 2014-03-24 16:33:12 -07:00
ZappoMan
03c2ec9376 add example of selecting the audio device from a menu 2014-03-24 16:28:45 -07:00
ZappoMan
778209ffe4 fix bug in Menu.removeMenu() for trees of menus 2014-03-24 16:28:07 -07:00
ZappoMan
c623d8e9ac tweak example script 2014-03-24 13:07:42 -07:00
ZappoMan
7ef1fe3a74 add support for listing all audio devices and default device in JS 2014-03-24 09:15:03 -07:00
ZappoMan
55b844ed6a add sample scripts 2014-03-23 11:27:06 -07:00
Brad Hefta-Gaub
c8ef3489d2 Merge pull request #2438 from Atlante45/inspect_js_fix 
Inspect js fix
 2014-03-21 15:27:04 -07:00
Brad Hefta-Gaub
c06caa4a4e Merge pull request #2422 from PhilipRosedale/master 
Bots can see voxels and move joints, fix drag bug in editVoxels
 2014-03-21 14:31:55 -07:00
Atlante45
53eaea6a22 Removed rest of orbit/pan code in editVoxels.js 2014-03-21 14:30:57 -07:00
Atlante45
3721ce8e43 Added boundaries to altitude and changed radius rate 2014-03-21 14:30:12 -07:00
Atlante45
c10d78c397 Fixed bug when mouse leaves window. 2014-03-21 14:29:19 -07:00
Atlante45
9f96129fb1 Fixed #2379 2014-03-21 14:22:26 -07:00
ZappoMan
939265356b fix editVoxels.js mouse clicking 2014-03-21 10:03:01 -07:00
Philip Rosedale
f72061801c Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 17:21:31 -07:00
Atlante45
6b118939fd Removed orbit from editVoxels.js so there is no conflict with inspect.js 2014-03-20 16:09:25 -07:00
Philip Rosedale
a30c4268da wave work for bot 2014-03-20 15:47:42 -07:00
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Atlante45
a95befb02e Added new script inspect.js 2014-03-20 12:15:38 -07:00
Philip Rosedale
c778794a4c Merge branch 'master' of https://github.com/worklist/hifi 2014-03-20 08:54:21 -07:00
Philip Rosedale
3ab0288c4f testing numbered joint movement 2014-03-20 08:54:12 -07:00
Stephen Birarda
cbbe4af65f fix crash in bot.js with incorrect playSound 2014-03-19 17:17:52 -07:00
Philip Rosedale
774b99d868 merge fix 2014-03-19 17:14:03 -07:00
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling 
allow Agents to send microphone audio using Sound objects
 2014-03-19 17:00:46 -07:00
Philip Rosedale
527c0f5a73 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-19 16:27:39 -07:00
Philip Rosedale
69a83ee94d add bots able to see voxels 2014-03-19 16:27:27 -07:00
Stephen Birarda
dd9c4aa854 changes to bot.js for new Agent microphone audio 2014-03-19 16:18:44 -07:00
Philip Rosedale
c26ed77931 merge fix 2014-03-19 09:16:52 -07:00
Philip Rosedale
83026fa2ca added skeet to gun, display joint names to log in crazy legs 2014-03-18 22:22:40 -07:00
Philip Rosedale
24c779e551 Fix bug in extrusion deleting first voxel made 2014-03-18 22:05:51 -07:00
ZappoMan
59b272d8db make seeing voxels less noisy and more random 2014-03-17 13:47:46 -07:00
ZappoMan
f8e38382a8 Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-16 19:37:41 -07:00
Brad Hefta-Gaub
6588002c8b Merge pull request #2317 from ey6es/master 
Return the legs to the default position when we stop "crazylegs."
 2014-03-14 17:25:56 -07:00
Andrzej Kapolka
608fa5869d Return the legs to the default position when we stop the script. 2014-03-14 14:51:33 -07:00
Philip Rosedale
85cc04f172 merge with upstream/master 2014-03-14 14:35:48 -07:00
Brad Hefta-Gaub
8f200e917b fix JS radians vs degrees issues 2014-03-14 13:03:14 -07:00
ZappoMan
8afbcae365 tweak to seeing load test 2014-03-14 00:43:11 -07:00
Philip Rosedale
88a0aa4221 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-13 21:37:40 -07:00
Philip Rosedale
902112437a Merge branch 'master' of https://github.com/worklist/hifi 2014-03-12 15:49:56 -05:00
Atlante45
9402a5852c Fixed review comments 2014-03-12 12:20:43 -07:00
Atlante45
1c4051b288 Added importBoundaries 2014-03-12 10:35:22 -07:00
Atlante45
03d7fb147c Fixed spaces added everywhere 2014-03-11 18:15:04 -07:00
Atlante45
6fcb802a94 Added preview deplacement + fixed locking issue 2014-03-11 18:01:38 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
Clement
ca0cd2d9d0 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-11 13:46:48 -07:00
ZappoMan
06a0332fd5 remove space bar behavior from editrVoxels.js 2014-03-10 16:44:33 -07:00
Philip Rosedale
2582b0007e Merge branch 'master' of https://github.com/worklist/hifi 2014-03-07 16:50:14 -06:00
Atlante45
045f0d5f21 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-07 14:33:37 -08:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
stojce
dbef17db59 code style 2014-03-06 22:42:34 +01:00
stojce
26fb2ed85d Merge branch 'master' of https://github.com/worklist/hifi into editVoxels 2014-03-06 21:54:17 +01:00
Philip Rosedale
d455c192e6 merge fix 2014-03-05 18:20:38 -08:00
Philip Rosedale
655eb2658c Adding scoring, throwing targets 2014-03-05 18:18:57 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Philip Rosedale
828159cdcb Merge pull request #2204 from ZappoMan/flocking_birds 
Flocking birds & more
 2014-03-05 18:01:41 -08:00
stojce
438b072907 editVoxels - importing voxels 2014-03-06 02:29:12 +01:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
ZappoMan
c34f76620f fix failed create voxel with key press 0 at startup of editVoxels.js 2014-03-05 10:52:46 -08:00
ZappoMan
15b5bb4385 Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds 
Conflicts:
	examples/bot.js
 2014-03-05 02:21:40 -08:00
ZappoMan
161e04f1a8 flocking bird JS 2014-03-05 02:20:03 -08:00
ZappoMan
2e3e699e31 Merge pull request #2199 from PhilipRosedale/master 
Adjustable bot pelvis height
 2014-03-04 18:47:01 -08:00
Philip Rosedale
2c27c6b8c1 adjustable height of bot avatars 2014-03-04 15:03:30 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Philip Rosedale
028b816e5b smaller damage 2014-03-03 22:17:55 -08:00
Philip Rosedale
897c2b8267 Add sounds for gun, reticle, mouse look firing 2014-03-03 22:14:59 -08:00
Atlante45
de679b20ad Removed deadlock from merge 2014-03-03 18:48:11 -08:00
Atlante45
357d71e637 Added stuff to localVoxelsExample.js 2014-03-03 17:52:49 -08:00
Atlante45
f1ce034c35 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 16:47:42 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
ZappoMan
0285fe51e8 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-03-03 12:14:11 -08:00
ZappoMan
1eeb2a5594 fix bug in editVoxels.js that wasn't deleting menus 2014-03-03 12:03:23 -08:00
Philip Rosedale
b845845af1 added rectangular range limits 2014-03-03 11:42:24 -08:00
ZappoMan
37472c201c added voxelDrumming as JS 2014-03-03 04:06:47 -08:00
ZappoMan
011bc4f6cb slightly less code to get it done 2014-03-03 01:11:03 -08:00
ZappoMan
d8d61c7361 move hydra finger painting from c++ to js 2014-03-03 01:06:48 -08:00
Philip Rosedale
3cfada1a1b avatar billboards match body/head 2014-02-28 17:14:18 -08:00
Philip Rosedale
3dd51db477 Added timer so one bot doesn’t talk twice at same time 2014-02-28 17:02:40 -08:00
Philip Rosedale
e35e06c0de Added Freddy’s 50 cocktail party clips 2014-02-28 13:59:34 -08:00
Atlante45
2ee7974fa8 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 17:53:59 -08:00
ZappoMan
0530a73175 Merge pull request #2134 from stojce/19513 
Code Review for Job #19513
 2014-02-27 16:30:54 -08:00
stojce
ae78cac78b removed some magic numbers 2014-02-28 00:05:46 +01:00
Atlante45
b033432684 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 14:36:44 -08:00
stojce
7d67b8e60d fixed vertical thumb placement on window resize 2014-02-27 23:28:23 +01:00
stojce
5c22376312 editVoxels new layout / assets 2014-02-27 23:20:40 +01:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
ZappoMan
2832c33482 fixed div by zero 2014-02-26 21:38:28 -08:00
Stephen Birarda
88b46acdeb repair for wrong body on bots < 20 2014-02-26 16:17:51 -08:00
ZappoMan
d361c75b50 more work on seeing voxels 2014-02-26 14:16:22 -08:00
ZappoMan
08b7b86c3e next pass at seeing voxels 2014-02-26 13:55:16 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
Philip Rosedale
220f9fda76 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-25 22:09:08 -08:00
Philip Rosedale
4da6af96bb Bots will move 2014-02-25 22:08:56 -08:00
ZappoMan
869b35a7aa remove old c++ implementation of voxel tools 2014-02-25 21:38:10 -08:00
Stephen Birarda
bf3b5c07d5 Merge pull request #2093 from ZappoMan/menu_js 
Adds support for editing application Menus to JS
 2014-02-25 17:40:39 -08:00
Atlante45
878259de48 Added example file for LocalVoxels use 2014-02-25 16:30:01 -08:00
Stephen Birarda
937768ae51 add option for fake billboard from URL, closes #2087 2014-02-25 13:51:48 -08:00
ZappoMan
73b0a5b359 switch to numbered swatches 2014-02-25 13:32:09 -08:00
ZappoMan
4d0a25b6ea add menus to editVoxels.js 2014-02-25 13:05:58 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -08:00
ZappoMan
0b6e81b8a6 remove more cruft 2014-02-25 10:31:29 -08:00
ZappoMan
74d48ab239 added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement 2014-02-25 10:23:59 -08:00
ZappoMan
cb01c1ee10 add separator support 2014-02-24 23:53:26 -08:00
ZappoMan
374b12980b added checkable menus and sub menus 2014-02-24 23:42:05 -08:00
ZappoMan
a3d0c20516 better support for shortcuts 2014-02-24 20:49:06 -08:00
Philip Rosedale
c783036fcc Merge pull request #2083 from ZappoMan/hideavatar 
add support for hiding local rendering of avatar
 2014-02-24 19:52:27 -08:00
ZappoMan
76355dc1a8 add support for hiding local rendering of avatar 2014-02-24 19:24:45 -08:00
ZappoMan
03f8885cad first cut at menus JS 2014-02-24 19:09:22 -08:00
Philip Rosedale
f4b485eb84 Updated color pallete for Grayson, pick random 1 of 3 add voxel sounds 2014-02-24 18:00:58 -08:00
Philip Rosedale
fffd45019d Added new sounds, default tool ON 2014-02-24 17:17:15 -08:00
Philip Rosedale
3a4ebe878b don’t drag avatar along during orbit, yet. 2014-02-24 17:03:14 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Stephen Birarda
4dea4b586b Merge pull request #2072 from birarda/master 
tweaks to bot script
 2014-02-24 14:35:05 -08:00
Stephen Birarda
3a90e175e0 tweaks to bot script 2014-02-24 14:34:13 -08:00
Andrzej Kapolka
2cea83a599 Proper header on ribbon.js, show display name for own avatar. 2014-02-24 13:36:43 -08:00
Andrzej Kapolka
40d9fffb7f Fix for warning. 2014-02-24 13:19:32 -08:00
Andrzej Kapolka
8cb5c639fb Added ribbon example that I had lying around. 2014-02-24 12:22:10 -08:00
Stephen Birarda
6cef72473d changes to the bot script 2014-02-24 10:04:08 -08:00
Stephen Birarda
5b83b7c434 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-24 09:58:32 -08:00
ZappoMan
6591a4b7fa correctly shutdown slider 2014-02-24 09:36:18 -08:00
Philip Rosedale
a9849c131f EditVoxels: avatar follows orbit, mousewheel updates selection 2014-02-23 22:48:35 -08:00
Philip Rosedale
26541e12b6 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 21:08:54 -08:00
Philip Rosedale
7f2fe14565 add mouseWheel to change voxel edit size 2014-02-23 20:23:31 -08:00
ZappoMan
766a922fb3 add work around for voxel add of larger voxel on top of smaller voxels 2014-02-23 19:02:10 -08:00
ZappoMan
dad97cd52e removed accidental code 2014-02-23 18:54:15 -08:00
ZappoMan
5b8d6ea314 removed unneeded code 2014-02-23 18:52:15 -08:00
ZappoMan
43f63781fc removed files we don't need 2014-02-23 18:35:39 -08:00
ZappoMan
24a5cbfbfd Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js 
Conflicts:
	examples/editVoxels.js
 2014-02-23 18:32:53 -08:00
Philip Rosedale
9b463dd8cf Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78 Adding mouse wheel sizing voxel 2014-02-23 17:26:09 -08:00
ZappoMan
892cc01dd9 added Voxels.getVoxelAt() to inspect local tree 2014-02-23 13:18:36 -08:00
ZappoMan
a8b34ae756 removed some debug settings 2014-02-23 12:58:20 -08:00
ZappoMan
78de562f41 added clipboard support to editVoxels.js 2014-02-23 12:52:41 -08:00
ZappoMan
f1577d12a0 make changes to local tree in Voxels JS interface 2014-02-23 12:36:38 -08:00
ZappoMan
9831fb5797 fix calculateVoxelFromIntersection() in editVoxels.js to work same as C++ code for voxel sizes larger than intersecting voxel 2014-02-23 12:09:53 -08:00
Andrzej Kapolka
6f8f15018c Allow setting the combined head orientation, which changes the body yaw and 
applies the rest to the head.  Closes #2050.
 2014-02-21 17:52:20 -08:00
Atlante45
6fb2d57e40 Add clipboardOverlay example to OverlaysExample 2014-02-21 16:04:15 -08:00
Stephen Birarda
060e5f8c67 updates to bot script for more bot styles 2014-02-21 13:52:54 -08:00
ZappoMan
4e28a8c312 Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js 2014-02-21 10:48:00 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
ZappoMan
8dac269c3c added selectable tools to the tool palette 2014-02-21 00:27:40 -08:00
ZappoMan
fb06512e67 improve z fighting adjust for preview voxels and highlights 2014-02-20 23:47:46 -08:00
ZappoMan
7026436dee first cut at touch support for orbit and pan, skeleton support for pan 2014-02-20 17:32:59 -08:00
Stephen Birarda
2626d7db8c add a bot example script 2014-02-20 11:14:50 -08:00
ZappoMan
d04166811e wired up voxel size slider to actually change voxel size 2014-02-20 02:24:26 -08:00
ZappoMan
7cab5013cc more work to wire up voxel size slider and +/- keys 2014-02-20 01:20:56 -08:00
ZappoMan
66d757863c adding first cut at voxel size slider to editVoxels.js 2014-02-19 23:52:29 -08:00
ZappoMan
546ab51ed5 add click support to color swatchs in editVoxels.js 2014-02-19 22:37:43 -08:00
ZappoMan
cbacf5f328 correctly draw tools when in orbit mode 2014-02-19 22:30:28 -08:00
ZappoMan
61d9ea44af add tool palette and eye dropper mode 2014-02-19 22:17:19 -08:00
ZappoMan
cbf1b09552 fix small bug in line preview mode 2014-02-19 21:07:52 -08:00
ZappoMan
f506c21590 add line preview mode to editVoxels.js and make that the default mode 2014-02-19 20:57:58 -08:00
ZappoMan
0e8cab7349 added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs 2014-02-19 20:09:35 -08:00
ZappoMan
91d79f65f2 fix crash on import from JS 2014-02-19 17:57:28 -08:00
ZappoMan
7662264af8 more work on clipboard example 2014-02-19 17:48:38 -08:00
ZappoMan
2a57080191 add clipboard example 2014-02-19 15:06:10 -08:00
ZappoMan
baa1762056 added support for overlays to editVoxels.js 2014-02-18 16:23:34 -08:00
ZappoMan
b8673db9aa remove unneeded example 2014-02-18 09:58:14 -08:00
ZappoMan
5cf0ad46e7 Merge pull request #2000 from gaitat/master 
Worklist Job #19503
 2014-02-18 09:47:26 -08:00
ZappoMan
78f4df912d added 3D line overlay support 2014-02-16 13:25:49 -08:00
ZappoMan
6b410253d4 update comments in example 2014-02-16 12:42:26 -08:00
ZappoMan
7c350b3acb add 3D sphere overlay support 2014-02-16 12:30:15 -08:00
gaitat
03d3a535f8 Fix for Worklist Job #19503 
Added random sound trigger to the examples
 2014-02-16 14:50:50 -05:00
ZappoMan
5abf908874 added 3D cube overlay support 2014-02-16 11:36:06 -08:00
ZappoMan
ef11865d24 implement text overlay support 2014-02-15 21:13:44 -08:00
gaitat
e30cf33a03 Fix for Worklist Job #19503 
Formatting errors
 2014-02-15 23:04:58 -05:00
ZappoMan
37bb85fca6 tweaks to overlays 2014-02-15 19:15:30 -08:00
ZappoMan
f7f695d145 add support for detecting clicked on overlays 2014-02-15 17:45:42 -08:00
ZappoMan
f6adce255d more work on image overlays 2014-02-15 16:26:34 -08:00
gaitat
fcd44f5817 Fix for Worklist Job #19503 2014-02-15 08:16:05 -05:00
gaitat
eee839f423 Merge branch 'master' of github.com:highfidelity/hifi 2014-02-14 20:12:39 -05:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
gaitat
58e773340a Worklist Job #19503 
Exposing the average audio intensity to javascript through the MyAvatar
object.
 2014-02-14 09:40:59 -05:00
Philip Rosedale
3a807c1914 comment out debugging spam, improved EditVoxels 2014-02-12 17:57:52 -08:00
Philip Rosedale
0322c8b934 Added minimum sample counting method for noise reduction 2014-02-11 23:44:22 -08:00
Philip Rosedale
1412d49a2f merge fix 2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b add Vec3::subtract in JS 2014-02-11 15:07:25 -08:00
ZappoMan
9244180cb4 removed debug 2014-02-10 20:27:39 -08:00
ZappoMan
4b2ddc9021 remove dead comment 2014-02-10 19:53:34 -08:00
ZappoMan
4b5e633258 tweaks to hydraMove.js, added scale to MyAvatar JS 2014-02-10 19:48:51 -08:00
ZappoMan
8b45e0e3a8 Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:34:35 -08:00
Philip Rosedale
49292a478e EditVoxels.js: Added new voxel making in front of camera with ‘9’ 2014-02-10 17:28:24 -08:00
ZappoMan
991c72006c moving the hydra grab behavior to JS 2014-02-10 17:25:14 -08:00
Philip Rosedale
65121aefb6 EditVoxels.js: Added color changing with number keys, better audio 2014-02-10 16:42:05 -08:00
ZappoMan
3f73b61a76 renamed hydraMove.js 2014-02-10 15:38:19 -08:00
ZappoMan
8acb6d13d5 move hydra thrust and view code into JS example 2014-02-10 15:25:09 -08:00
ZappoMan
f8a24a2e99 fix crash in multiple voxel edit scripts running simultaneously 2014-02-10 12:19:46 -08:00
ZappoMan
bdf5c7a6b7 changed stopKeepLookingAt() to stopLooking() 2014-02-09 23:26:46 -08:00
ZappoMan
d5447452ae more work on lookAt behavior 2014-02-09 21:06:32 -08:00
ZappoMan
a457ccf933 simple example of Camera.lookAt() 2014-02-09 16:25:18 -08:00
ZappoMan
fe1a6b8f29 improvements to rotating gesture detection 2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927 added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties 2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8 Merge branch 'master' of https://github.com/worklist/hifi into more_events 2014-02-09 10:32:14 -08:00
ZappoMan
70c5e674e9 add rotating detection to touch events 2014-02-09 02:54:12 -08:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
ZappoMan
120807f9ba add touch event radius 2014-02-09 01:31:48 -08:00
ZappoMan
02e6a3336d added several new JS events attributes 2014-02-09 01:05:27 -08:00
Philip Rosedale
cfa7f5e6ca Add drag to add more voxels, turn off hover orbit voxels until in the script as function key 2014-02-08 23:17:04 -08:00
Philip Rosedale
6b0c31e6e9 Script for editing voxels with mouse clicks 2014-02-08 20:47:02 -08:00
Philip Rosedale
c6bf11361e Merge branch 'master' of https://github.com/worklist/hifi 2014-02-08 16:52:28 -08:00
ZappoMan
e9070b1d70 add an example of adding a voxel when clicking on a voxel 2014-02-07 15:48:46 -08:00
ZappoMan
ac05c6d4c3 add example code 2014-02-07 15:21:16 -08:00
Philip Rosedale
8ca7a60927 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-07 11:21:26 -08:00
ZappoMan
2157349804 added Camera.computePickRay() 2014-02-07 09:40:52 -08:00
ZappoMan
41f6650b20 implement movable independent camera with hydra 2014-02-07 01:23:30 -08:00
Philip Rosedale
a9b330baff Merge branch 'master' of https://github.com/worklist/hifi 2014-02-06 07:46:26 -08:00
ZappoMan
3e08a0b48b fix spacebar capture 2014-02-05 13:26:46 -08:00
Philip Rosedale
d88d598e2b Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 21:29:38 -08:00
ZappoMan
5afe184c3b removed debug 2014-02-04 21:16:07 -08:00
ZappoMan
7ffe73bf6e added the cannon as voxels 2014-02-04 21:14:49 -08:00
ZappoMan
15be49cb8d latest changes to space invaders 2014-02-04 21:08:12 -08:00
ZappoMan
758c1e0817 add examples for setting model scale and translation 2014-02-04 20:28:11 -08:00
Philip Rosedale
7935e68e7a Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 14:33:33 -08:00
ZappoMan
785e76102f change game at for space invaders to be close to avatar 2014-02-04 14:22:22 -08:00
ZappoMan
461a600d7f add sounds to space invaders 2014-02-04 14:04:33 -08:00
ZappoMan
2b429ba2d3 downward motion to space invaders 2014-02-04 13:18:19 -08:00
Philip Rosedale
5b709aa60c merge fix 2014-02-03 16:09:53 -08:00
Philip Rosedale
3f5aa083d7 improved bird behavior 2014-02-03 16:08:59 -08:00
AndrewMeadows
6dc959f780 Merge pull request #1831 from ZappoMan/scripting 
More scripting work
 2014-02-03 12:43:56 -08:00
ZappoMan
f33f4e9cc2 change invaders to use absolute positions 2014-02-03 11:09:30 -08:00
ZappoMan
f41d2a3c02 change Agent to Script 2014-02-03 10:35:25 -08:00
Stephen Birarda
e2842ab7a4 stop timers when the script does, add cleanup methods 2014-02-03 10:10:58 -08:00
ZappoMan
906d913d71 added more examples, updated lookWithMouse.js to support alwaysLook 2014-02-03 10:05:07 -08:00
Stephen Birarda
9dd8c11e1e change script timer setup to match HTML dom standard 2014-02-03 09:59:16 -08:00
Stephen Birarda
d9cfaec4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer 2014-02-03 09:32:13 -08:00
Stephen Birarda
a7f2406505 add an example timer script 2014-01-31 16:40:24 -08:00
Stephen Birarda
dba7fbceac remove extra Script and commented out line 2014-01-31 15:00:35 -08:00
Stephen Birarda
9015b24aa5 update the script examples for new nomenclature 2014-01-31 14:41:24 -08:00
ZappoMan
da5e0f55b6 add easier support for key codes in JS by adding text property and auto-detecting isShifted 2014-01-30 12:26:50 -08:00
ZappoMan
01c369716e implement a basic exampple of ride along with a particle 2014-01-29 20:55:12 -08:00
ZappoMan
a048799367 fix header comment 2014-01-29 20:54:22 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
ecd2477007 adding lookWithMouse.js example that uses mouse instead of multi-touch to add the look around feature 2014-01-29 01:01:41 -08:00
ZappoMan
a73733e57b controller scripting example 2014-01-28 19:48:06 -08:00
ZappoMan
64afd17d14 include particle radius in model scaling 2014-01-28 11:49:11 -08:00
ZappoMan
bd0631838d example of setting particle model with JS 2014-01-28 11:19:04 -08:00
ZappoMan
13a92bc3c9 tweaks to editParticle example 2014-01-27 11:11:20 -08:00
Philip Rosedale
56e90323f9 merge fix 2014-01-25 09:42:36 -08:00
ZappoMan
afb7ab07da added new example of particle bird 2014-01-24 15:35:21 -08:00
ZappoMan
2720b98d57 fix comment 2014-01-24 13:00:54 -08:00
ZappoMan
c5dd94f0cf add example 2014-01-24 13:00:01 -08:00
Philip Rosedale
b0e1018771 Add particle-based bird 2014-01-24 11:01:09 -08:00
Philip Rosedale
5d1a320dd0 fixed merge 2014-01-23 13:50:44 -08:00
ZappoMan
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -08:00
Philip Rosedale
86e37f8fc2 new sounds for drumsticks 2014-01-23 11:53:46 -08:00
Brad Hefta-Gaub
aacad00791 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 11:16:21 -08:00
Brad Hefta-Gaub
c3b681786a make particles and voxels JS APIs all operate on meters not domain units 2014-01-22 11:12:52 -08:00
Brad Hefta-Gaub
1b5938d0af new toyball script that is DRY-er 2014-01-22 09:48:04 -08:00
Brad Hefta-Gaub
64940a04ff latest toyball script 2014-01-22 09:18:01 -08:00
Philip Rosedale
6ba5daad0c better comments in script 2014-01-22 08:44:43 -08:00
Philip Rosedale
5d9cf23ac5 Added drumSticks example script 2014-01-22 08:38:45 -08:00
Brad Hefta-Gaub
cefac50100 adding toyball script 2014-01-21 20:05:41 -08:00
Brad Hefta-Gaub
eb1e72b838 fix a bug where x was only attribute being copied for vec3s WHT 2014-01-21 16:40:03 -08:00
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
1c5e32fcb1 add example of new particle edit JS api 2014-01-21 14:08:19 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
ZappoMan
17abbc4715 Merge pull request #1586 from PhilipRosedale/master 
Clap script and better bird sounds
 2014-01-20 09:06:28 -08:00
Philip Rosedale
618c324e82 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 20:29:24 -08:00
Philip Rosedale
4547f07739 added fountain script 2014-01-17 17:10:15 -08:00
Philip Rosedale
5abf612990 new sounds for voxelBird, clap scripts 2014-01-17 16:43:43 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
Brad Hefta-Gaub
785d84d0ca added count example 2014-01-17 09:55:34 -08:00
Philip Rosedale
7f09aff297 Added voxelBird example script 2014-01-14 17:12:14 -08:00
Philip Rosedale
8efd09befa bullets smaller and slower 2014-01-05 16:40:02 -08:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Philip Rosedale
a2c33aadba two script example files 2014-01-03 17:58:00 -08:00
ZappoMan
32ec15beb7 added comments to example scripts 2013-12-31 12:24:37 -08:00
ZappoMan
8f9a99e1f4 add example scripts 2013-12-31 12:13:06 -08:00