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

933 commits

Author SHA1 Message Date
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Atlante45
881ca61a09 Modified recordings namefilter 2014-09-18 00:30:07 -07:00
Andrew Meadows
b311333ac3 initial tuning of headMove.js for avatar motor 2014-09-17 22:35:39 -07:00
Andrew Meadows
613b270d24 headMove.js using experimental avatar motor 2014-09-17 17:57:50 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Craig Hansen-Sturm
896cb70ff6 Merge pull request #3424 from PhilipRosedale/master 
Fixes to audio attenuation jumps and better sample loop script
 2014-09-16 12:00:36 -07:00
David Rowe
ed2216d100 Apply right hand roll work-around only if Windows 2014-09-16 11:13:42 -07:00
ZappoMan
ffe1e2db00 fix crash in butterflies.js 2014-09-16 09:07:22 -07:00
Philip Rosedale
62b21f52af fix for sharp change in attenuation when too near a source 2014-09-16 01:18:42 -07:00
David Rowe
f890ea744b Add calibration of physical hand height 2014-09-15 23:09:00 -07:00
David Rowe
f1d7ab149f Add calibration of "zero" position according to avatar body 2014-09-15 21:25:50 -07:00
Philip Rosedale
af638a9963 Use dimensions, not radius 2014-09-15 20:55:25 -07:00
David Rowe
543e9e3eb5 Access wrist controller rotation only once per frame 2014-09-15 20:22:53 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
Philip Rosedale
ca556d7eb3 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-15 20:00:49 -07:00
Philip Rosedale
4dc929eddb Simpler script with sphere to indicate emission point 2014-09-15 19:50:38 -07:00
Brad Hefta-Gaub
cb1c8a9bb2 Merge pull request #3417 from thoys/load-script-from-message-example-js 
load a javascript from a message when the user agrees
 2014-09-15 18:33:14 -07:00
Atlante45
9bed37c86c Update position of audio 2014-09-15 16:05:26 -07:00
Atlante45
f3e2507ed3 Merge branch 'master' of https://github.com/highfidelity/hifi into radio_js 2014-09-15 15:54:31 -07:00
Thijs Wenker
6feb732467 load a javascript from a message when the user agrees 2014-09-15 21:30:19 +02:00
David Rowe
1527c40e1d Add hand roll, pitch, and yaw 2014-09-14 15:25:02 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
David Rowe
4382b62613 Add TODO for reviewing Leap Motion right hand roll calculation 2014-09-14 14:02:03 -07:00
David Rowe
1b48d5c040 Add hand pitch, roll, and yaw from Leap Motion 2014-09-14 13:47:15 -07:00
David Rowe
1f159a5ce5 Refactor w.r.t. hands 2014-09-14 13:47:13 -07:00
David Rowe
c7b34b4f54 Lower left and right hands independently when no longer being tracked 2014-09-14 13:47:13 -07:00
David Rowe
b4592aceb6 Add interim work-around and TODOs for Leap Motion controller issues 2014-09-14 13:47:12 -07:00
David Rowe
16eca79cfa Add leapHands.js that makes avatar fingers mirror real finger movements 2014-09-14 13:47:11 -07:00
Thijs Wenker
df0cbd54fc Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/Application.cpp
 2014-09-12 23:04:05 +02:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities 
New Entities Features
 2014-09-12 13:57:45 -07:00
Thijs Wenker
1838272d73 moved back butterflies.js , did I do it right? 2014-09-12 22:53:53 +02:00
Brad Hefta-Gaub
fc33de28a0 Merge pull request #3399 from huffman/19831 
Code Review for Job #19831
 2014-09-12 13:45:20 -07:00
Ryan Huffman
113e9cf43b Remove use of Quat::rotate 2014-09-12 13:31:07 -07:00
Thijs Wenker
dd47b7afc6 Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
 2014-09-12 22:04:21 +02:00
Brad Hefta-Gaub
16d4563af0 Merge pull request #3383 from Adrianl3d/19977 
Code Review for Job #19977
 2014-09-12 12:53:28 -07:00
ZappoMan
16f9d60df7 upgrade butterflies to use dimensions 2014-09-12 08:34:02 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
 2014-09-12 08:18:09 -07:00
Thijs Wenker
e62380a171 globalServicesExample.js 2014-09-12 02:23:25 +02:00
Ryan Huffman
ffa47b1923 Add header comment to gracefulControls.js 2014-09-11 15:22:04 -07:00
Ryan Huffman
50090c62f2 Update MAX_SPEED and ACCELERATION in gracefulControls.js 2014-09-11 15:16:42 -07:00
Philip Rosedale
5c77040235 remove debug print 2014-09-11 12:15:02 -07:00
Ryan Huffman
a733b13118 Fix vertical movement on gracefulControls.js 2014-09-11 11:34:47 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
Philip Rosedale
634bfe5e1d remove renamed script 2014-09-10 19:02:22 -07:00
Philip Rosedale
0078b45a8f update headMove to have optional concept of a room that we cannot escape, update and rename butterflies script 2014-09-10 19:00:24 -07:00
ZappoMan
0d80c32306 editModels debug cleanup 2014-09-10 14:51:58 -07:00
ZappoMan
8023735eb3 changed rotational to angular and added angular damping 2014-09-10 14:46:27 -07:00
ZappoMan
bb52c4a1b3 store angular valocity as 3 vector 2014-09-10 11:28:45 -07:00
ZappoMan
d4dad8f4d8 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 2014-09-10 10:45:57 -07:00