Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-07 08:48:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37270 commits 25 branches 0 tags 1.1 GiB
Commit graph

4975 commits

Author SHA1 Message Date
James B. Pollack
3a6478aac1 Update raveStick.js 
leading zeroes
 2015-12-28 21:15:52 -08:00
James B. Pollack
bf296a36ed cleanup change model 2015-12-28 18:38:09 -08:00
James B. Pollack
d8ef19a019 working!! 2015-12-28 18:32:49 -08:00
Anthony J. Thibault
4661152aa7 NeuronAvatar.js: Now aligns the head with the HMD if active 2015-12-28 17:57:24 -08:00
ericrius1
cc35eaf4be Added glow effect to ravestick 2015-12-28 17:32:10 -08:00
James B. Pollack
93a81315f2 Merge branch 'master' into doppelganger 2015-12-28 16:43:28 -08:00
James B. Pollack
2ec712a5db disable near grabbing on sliders 2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0 clear sliders at cleanup 2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce readme 2015-12-28 15:14:59 -08:00
James B. Pollack
5786789a66 cleanup cleanup 2015-12-28 15:12:29 -08:00
Philip Rosedale
36beea17fa Improved hand controller reticle movement 2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251 switch 2015-12-28 14:50:35 -08:00
James B. Pollack
d4fd59edc0 send blacklist messages 2015-12-28 13:49:00 -08:00
Eric Levin
890b39f04b Merge pull request #6740 from imgntn/blacklist_grab 
Add Raypick Blacklisting to handControllerGrab.js
 2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07 mege 2015-12-28 13:21:00 -08:00
James B. Pollack
5e6e2bd11c work 2015-12-28 13:06:43 -08:00
James B. Pollack
8eeae5ddf0 Merge pull request #6736 from ericrius1/handGrabCalcs 
Hand grab calcs
 2015-12-28 10:49:55 -08:00
James B. Pollack
e237f957a6 Merge branch 'master' into blacklist_grab 2015-12-28 10:24:27 -08:00
James B. Pollack
c4d7b7b9bb Update utils.js 2015-12-28 10:21:23 -08:00
James B. Pollack
a133dfa8dd Merge pull request #6738 from ericrius1/rayBlacklist 
Ray-pick blacklisting
 2015-12-28 10:19:52 -08:00
Anthony Thibault
1f834a9c01 neruonAvatar.js: attempt to adjust hips for HMD mode. 
It attempts to adjust the hips so that the avatar's head is at the same location & orientation as the HMD
in world space, however it's fighting with the internal c++ code that also attempts to adjust the hips as well.
 2015-12-27 16:29:30 -08:00
James B. Pollack
0e30393c81 make sure theres something on the blacklist 2015-12-27 12:47:56 -08:00
James B. Pollack
546e908633 protect blacklisting to my id 2015-12-27 12:46:40 -08:00
James B. Pollack
28c53822b1 add raypick blacklisting to hand grab script 2015-12-27 12:37:33 -08:00
James B. Pollack
3f73f83cf1 add doppelganger 2015-12-27 11:23:54 -08:00
Brad Davis
8e2a79ba4c Merge pull request #6735 from ZappoMan/headPoseReticle 
add a test script for HMD.getHUDLookAtPositionXX()
 2015-12-27 13:19:18 -05:00
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
ericrius1
542d8a4b6c Fixed spelling mistakes 2015-12-24 12:06:29 -08:00
ericrius1
2e95ca7947 fixed syntax error 2015-12-24 12:05:11 -08:00
ericrius1
340c066b5c reverted whiteboard changes 2015-12-24 12:04:36 -08:00
ericrius1
8e7dfc07c0 Added logic to blacklist entities from raypicking 2015-12-24 11:59:47 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
ericrius1
e8a6fd1f05 adding ray filters example/test 2015-12-24 11:00:24 -08:00
ericrius1
24796c1a1e updated ravestick spawner relative position 2015-12-24 10:14:36 -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
ericrius1
cd983db419 fixed merge conflicts 2015-12-23 15:13:45 -08:00
ericrius1
b4988b0998 Taking individual avatar hand size into consideration for grabbing objects 2015-12-23 15:09:10 -08:00
Brad Hefta-Gaub
f8a515de64 add a test script for HMD.getHUDLookAtPositionXX() 2015-12-23 14:46:18 -08:00
James B. Pollack
65d5e3f60a add labels and transparent panel, but panel blocks pick so disable 2015-12-23 14:11:42 -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
aa0d1f0c29 temp 2015-12-22 17:15:23 -08:00
James B. Pollack
64eb22bf22 merging 2015-12-22 16:34:01 -08:00
James B. Pollack
c39f26ad72 new features 2015-12-22 16:31:49 -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
James B. Pollack
56d654987c changing branches 2015-12-22 11:48:56 -08:00
Eric Levin
e8803ad9ae Lightsaber looks way better now 2015-12-22 11:35:04 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00
Seth Alves
6e1217d376 if an action fails (probably due to time skew bug), recreate it 2015-12-22 11:22:35 -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
David Rowe
58f1371eba Fix particle radius and rgba start, middle, finish interpolation 
Bezier interpolation of 3 points doesn't intersect the middle value.
Instead, use separate Bezier interpolations for start-middle and middle-
finish, so that the interpolated values intersect the middle value as a
user would expect.
 2015-12-22 15:08:03 +13: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
Seth Alves
76df582a6c Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 14:29:32 -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
James B. Pollack
b59b8db5c9 set defaults 2015-12-21 12:09:18 -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
samcake
6bbc94badc Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-21 10:48:55 -08:00
ericrius1
45ba7a3d35 merged 2015-12-21 10:46:54 -08:00
ericrius1
0dd7287e61 mergedq 2015-12-21 10:46:45 -08:00
ericrius1
7a7befafb9 arc balls working 2015-12-21 10:43:59 -08:00
Seth Alves
1d9a81d5d4 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 09:14:37 -08:00
Brad Davis
46a4a469e9 Merge pull request #6689 from ZappoMan/rightClickMenu 
Some early work to support hand driven reticle
 2015-12-20 17:49:50 -08:00
James B. Pollack
da57e29096 start options, cleanup 2015-12-20 16:40:41 -08:00
James B. Pollack
485bb4ee3f slider should stay with avatr 2015-12-19 19:14:56 -08:00
James B. Pollack
daa262af7d readme 2015-12-19 19:14:19 -08:00
James B. Pollack
9f0d254739 panel entity, readme 2015-12-19 19:11:17 -08:00
James B. Pollack
05467bd5e1 create panel entity and parent panel to it 2015-12-19 18:19:00 -08:00
James B. Pollack
378d50d8a3 update overlays when cutoff slider is used 2015-12-19 12:49:42 -08:00
James B. Pollack
eb03dcd821 keep parent of lights that already have parents 2015-12-19 12:47:44 -08:00
James B. Pollack
890f98b38b Merge branch 'master' into light_mod 2015-12-19 12:23:23 -08:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Seth Alves
cdefa7ec32 move some debugging scripts into their own directory 2015-12-19 08:09:39 -08:00
Seth Alves
b82559e898 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-19 07:08:25 -08:00
Brad Hefta-Gaub
e929e3f789 more work on angular velocity tests 2015-12-18 19:20:32 -08:00
ericrius1
1beec0dbe7 balls 2015-12-18 18:15:05 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Seth Alves
4c996885e5 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-18 17:15:29 -08:00
samcake
7e66515beb Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
James B. Pollack
b0da1773c2 have right rotation on sequential edits 2015-12-18 16:53:41 -08:00
James B. Pollack
4afdd0242b cleanup 2015-12-18 16:44:20 -08:00
James B. Pollack
f834765990 readme 2015-12-18 16:39:21 -08:00
James B. Pollack
e405311cc8 cleanup 2015-12-18 16:35:06 -08:00
Seth Alves
f60240e3f3 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-18 16:28:51 -08:00
James B. Pollack
0e530900d4 sequential editing 2015-12-18 16:22:20 -08:00
samcake
41525a7c4d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub
a621579f17 add philips version of hand movement 2015-12-18 15:44:21 -08:00
Brad Hefta-Gaub
4075f355a3 more work on hand movement 2015-12-18 15:44:01 -08:00
ericrius1
fffe6dbb9b relative rotation 2015-12-18 15:38:01 -08:00
samcake
f24800cf10 Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script 2015-12-18 15:35:01 -08:00
ericrius1
514cb7a329 Beams arc to each other. BAM 2015-12-18 15:26:21 -08:00
ericrius1
2dbb3bd84a Added grab offsets to createPingPongGun.js 2015-12-18 15:12:46 -08:00
Seth Alves
7689453ba2 don't reset action refresh counter untill the updateAction succeeded 2015-12-18 15:11:28 -08:00
James B. Pollack
387c30d83f close button 2015-12-18 15:04:13 -08:00
Brad Hefta-Gaub
868d10651a Merge pull request #6651 from jherico/webengine 
Migrate QML based web views to Qt WebEngine
 2015-12-18 14:56:35 -08:00
ericrius1
77264b3f99 Ping pong gun lines up with hand 2015-12-18 14:52:39 -08:00
Seth Alves
13ad6bf2f7 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-18 14:52:02 -08:00
Seth Alves
5bede8123d script for debugging queryAACube 2015-12-18 14:47:05 -08:00
Brad Hefta-Gaub
42764426ce Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-18 14:30:16 -08:00
Brad Hefta-Gaub
5701ad2e8c update to new angular velocity 2015-12-18 12:38:50 -08:00
James B. Pollack
f84a441c7d close button 2015-12-17 18:33:17 -08:00
David Rowe
c3e3af7c8c Document effect of Bezier interpolation on particle radius simulation 2015-12-18 15:11:43 +13:00
David Rowe
e2ecc388ca Indicate particle properties that (temporarily) aren't working 2015-12-18 15:10:47 +13:00
David Rowe
5aef309b8a Get particles in particlesTest.js emitting again 2015-12-18 15:09:36 +13:00
Brad Hefta-Gaub
762aefbbca add hand driven reticle 2015-12-17 17:38:20 -08:00
James B. Pollack
7a542a678b prep for close button 2015-12-17 17:17:04 -08:00
James B. Pollack
a25feb5578 switching branches 2015-12-17 16:58:38 -08:00
ericrius1
aa1f77ab1c adding ravestick to toybox demo room 2015-12-17 15:42:52 -08:00
Atlante45
9d6618c341 Cleanup DebugDeferredBuffer code 2015-12-17 15:18:23 -08:00
Atlante45
b271542b73 Save DebugMode to setting, restore on script start 2015-12-17 15:18:23 -08:00
ericrius1
3e6ae7c571 added lightball back 2015-12-17 15:02:25 -08:00