Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13152 commits 75 branches 59 tags 1.2 GiB
Commit graph

452 commits

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