Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 04:10:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36624 commits 71 branches 59 tags 1.2 GiB
Commit graph

4777 commits

Author SHA1 Message Date
Anthony Thibault
fd3eed3d41 NeruonPlugin: translation support 
Warn if translations are not present.
 2015-12-26 11:50:54 -08:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb Set up controller poses to match hifi standard skeleton 
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
 2015-12-25 09:57:50 -08:00
Anthony Thibault
8b979b67ee neruonAvatar.js: now sets rotations in correct frame. 
The rotations from the neuron are effectively in world space and are deltas
from the default pose.

There still is an issue with the thumb, due to the missing joint from the Neuron.
The Neuron only has 3 thumb joints, not 4.
 2015-12-24 17:16:49 -08:00
Anthony J. Thibault
c44f69b370 WIP checkpoint 
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
 2015-12-23 17:13:52 -08:00
AlessandroSigna
2c72e7964d Fix assignment 2015-12-23 13:54:06 -08:00
Zach Pomerantz
ea9f2e57ce Simplify renderDebug GUI 2015-12-23 13:09:45 -08:00
Thijs Wenker
505f4ce7e4 Merge branch 'master' of https://github.com/worklist/hifi into 20736 
Conflicts:
	examples/controllers/handControllerGrab.js
 2015-12-23 02:37:38 +01:00
James B. Pollack
4115138b5b fix merge problems 2015-12-22 17:22:55 -08:00
Anthony J. Thibault
6afe3bae5e Copy Neuron joints into controller poses 
This makes the accessible for controller mapping and to JavaScript.

Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar.  NOTE: the rotations are currently in the wrong coordinate frame.
 2015-12-22 17:21:33 -08:00
James B. Pollack
64eb22bf22 merging 2015-12-22 16:34:01 -08:00
James B. Pollack
edd11a670a minor adjustments to particles 2015-12-22 14:38:53 -08:00
James B. Pollack
60f2314469 remove debugging print 2015-12-22 14:38:05 -08:00
Brad Davis
a6d9dbc5c4 Merge pull request #6728 from ZappoMan/rightClickMenu 
More Hand Reticle movement improvements
 2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub
9a3d72c7b6 tweak sleep cycle slightly 2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub
119f3e9895 make both hands and mouse work 2015-12-22 13:35:16 -08:00
James B. Pollack
52e6b84968 Update lightBall.js 
zeroes
 2015-12-22 12:09:16 -08:00
James B. Pollack
7bc7bddc3a set defaults 2015-12-22 12:00:45 -08:00
Brad Hefta-Gaub
cc00aa01fb Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-22 11:54:34 -08:00
James B. Pollack
80e8fcf502 Merge branch 'master' into particle_grab 2015-12-22 11:49:51 -08:00
ericrius1
bb28369dee Merge branch 'polylineOptimizations' of https://github.com/ericrius1/hifi into polylineOptimizations 2015-12-22 11:49:31 -08:00
Eric Levin
e8803ad9ae Lightsaber looks way better now 2015-12-22 11:35:04 -08:00
Eric Levin
653e3ecdcc fixed offset issue with lightsaber 2015-12-22 11:02:36 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Thijs Wenker
6c34059061 (note to self, ctrl-s every 5 seconds in code editor) 2015-12-22 14:24:14 +01:00
Thijs Wenker
c62ff3e5be Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-22 14:14:04 +01:00
Thijs Wenker
b97f7ace66 path fix 2015-12-22 14:09:25 +01:00
Thijs Wenker
aefff1a59b script to trigger recording with an assignment-client using messages-mixer 2015-12-22 14:08:12 +01:00
Thijs Wenker
60e1c74fe9 winter games target Practice scripts 2015-12-22 13:58:18 +01:00
ericrius1
1031489ada changed dates 2015-12-21 19:08:34 -08:00
ericrius1
ba993eccd4 cleanup 2015-12-21 18:32:07 -08:00
ericrius1
8d80c06f02 updated ravestick model 2015-12-21 18:26:28 -08:00
Brad Hefta-Gaub
025e769a9f average both hands, enabled both mouse clicks, and detect base station resting hand 2015-12-21 18:25:30 -08:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
Brad Hefta-Gaub
da86686533 fix reticle drive 2015-12-21 17:10:01 -08:00
Zach Pomerantz
f146b207c4 Update JS debug scripts to use nested props 2015-12-21 15:27:37 -08:00
ericrius1
f19d1a3067 cleanup 2015-12-21 15:20:36 -08:00
ericrius1
876d8ab6b2 far grabbing arc balls 2015-12-21 13:59:00 -08:00
Brad Hefta-Gaub
111a8caa3c Merge pull request #6701 from highfidelity/graphics 
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
 2015-12-21 13:54:50 -08:00
ericrius1
cabc47e7a9 lightsaber immediately turns off on release 2015-12-21 13:30:52 -08:00
ericrius1
4110630d1f fixed ravestick fargrab 2015-12-21 13:15:37 -08:00
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
Thijs Wenker
5d1e5b054a Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-21 21:48:55 +01:00
ericrius1
4b4fe96b64 tweaks 2015-12-21 12:47:31 -08:00
ericrius1
b89e25f8f7 correct file 2015-12-21 11:35:57 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
ericrius1
ba3633710a name fixes 2015-12-21 11:29:59 -08:00
ericrius1
3c66e38268 test 2015-12-21 11:12:59 -08:00
ericrius1
48ab99c348 rotation fix 2015-12-21 11:00:10 -08:00
Brad Hefta-Gaub
248b3d09ac add absolute rotation based hand reticle movement 2015-12-21 10:49:49 -08:00