Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 15:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36777 commits 25 branches 0 tags 1.1 GiB
Commit graph

36777 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
32b9f60bd5 Merge pull request #6731 from imgntn/grabhotfix1 
fix  handControllerGrab  merge problems
 2015-12-22 17:24:30 -08: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
Brad Hefta-Gaub
68c6cae4f3 fix warning 2015-12-22 17:21:25 -08:00
Brad Hefta-Gaub
7a09582a65 Merge pull request #6729 from zzmp/fix/reorder 
Reorder RenderContext initializer to avoid -Wreorder
 2015-12-22 17:19:32 -08:00
James B. Pollack
aa0d1f0c29 temp 2015-12-22 17:15:23 -08:00
Seth Alves
46233b24c0 Merge pull request #6630 from imgntn/particle_grab 
Add Various Grab Visualization Options
 2015-12-22 16:51:30 -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
Brad Davis
88d36487f8 Merge pull request #6727 from samcake/hdr 
Clean up shaders removing  glowIntensity and alphaThreshold legacy
 2015-12-22 15:41:08 -08:00
Zach Pomerantz
df78f895a6 Reorder RenderContext initializer to avoid -Wreorder 2015-12-22 14:54:47 -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
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
James B. Pollack
88a5a0a35d Merge pull request #6685 from ericrius1/polylineOptimizations 
First pass at Flow Arts Hut
 2015-12-22 12:28:34 -08:00
James B. Pollack
52e6b84968 Update lightBall.js 
zeroes
 2015-12-22 12:09:16 -08:00
James B. Pollack
5e0a428dec Update hiddenEntityReset.js 
add zeroes
 2015-12-22 12:07:57 -08:00
James B. Pollack
51630734df Update masterReset.js 
add initial zeroes
 2015-12-22 12:07:02 -08:00
ericrius1
6fc98bd577 fixed ravestick, merged 2015-12-22 12:03:03 -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
Brad Hefta-Gaub
298e4d0f83 Merge pull request #6726 from jherico/legacy_oculus 
Legacy oculus work
 2015-12-22 11:02:37 -08:00
Eric Levin
653e3ecdcc fixed offset issue with lightsaber 2015-12-22 11:02:36 -08:00
Brad Hefta-Gaub
22bc6f861a Merge pull request #6722 from jherico/server_only_build 
Add CMake flag for building only server components
 2015-12-22 10:53:26 -08:00
Bradley Austin Davis
79d8b20637 Simulating Oculus interaction on legacy platforms 2015-12-22 10:09:45 -08:00
Ryan Huffman
00b47cacea Fix crash when getting MyAvatar.sessionUUID from AvatarManager 
The previous code inadvertently added a default constructed shared pointer
to the avatar hash, causing it to crash when dereferencing it in
the update loop.
 2015-12-22 09:59:57 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Brad Davis
7fdeb66cf4 Merge pull request #6723 from ZappoMan/macHydraCrash 
fix crash on mac when sixense DLL can't be loaded
 2015-12-22 09:32:23 -08:00
Bradley Austin Davis
e0e1ae43f5 Fixing legacy oculus plugin 2015-12-22 09:28:38 -08:00
Brad Davis
243fba461d Add CMake flag for building only server components 2015-12-22 09:19:07 -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
Brad Hefta-Gaub
eff830ad4b fix crash on mac when sixense DLL can't be loaded 2015-12-22 01:03:23 -08:00
ericrius1
1031489ada changed dates 2015-12-21 19:08:34 -08:00
ericrius1
ba993eccd4 cleanup 2015-12-21 18:32:07 -08:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK 
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
 2015-12-21 18:30:15 -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