Commit graph

308 commits

Author SHA1 Message Date
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
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