Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11062 commits 71 branches 56 tags 1.2 GiB
Commit graph

264 commits

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