Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34281 commits 69 branches 56 tags 1.2 GiB
Commit graph

34281 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
James B. Pollack
9851ddb39c Merge pull request #6270 from ericrius1/hoopName 
Removing bball hoop from reset scripts- will be saved in SVO instead
 2015-11-02 16:14:15 -08:00
AlessandroSigna
b77945d430 Vive - fix input drifting 
Conflicts:
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
 2015-11-02 16:06:17 -08:00
Brad Davis
699a13b2a7 Merge pull request #6275 from ZappoMan/mappingTweaks 
Mapping tweaks to match Controllers spec
 2015-11-02 16:06:08 -08:00
Brad Davis
5d957e6535 Merge pull request #6255 from samcake/controllers 
Controllers : Adding support for  'NOT' ito the conditional endpoint
 2015-11-02 16:03:52 -08:00
Brad Hefta-Gaub
02288e84e8 CR feedback 2015-11-02 15:35:30 -08:00
samcake
3d2739c7b4 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-02 15:34:57 -08:00
Brad Hefta-Gaub
f532607cca add touch and other gestures to standard 2015-11-02 15:06:38 -08:00
samcake
0211e00c86 Cleaning the feature not conditional do the true design 2015-11-02 15:01:59 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
samcake
c2687b4998 Cleaning the feature not conditional do the true design 2015-11-02 14:17:07 -08:00
Brad Hefta-Gaub
5a93516330 Merge pull request #6276 from sethalves/lazy-smi-init 
don't initialize SMI sdk unless we need it
 2015-11-02 14:05:38 -08:00
Seth Alves
310a5c9bfb don't initialize SMI sdk unless we need it 2015-11-02 13:42:12 -08:00
Brad Hefta-Gaub
d359aa3b65 more tweaks 2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub
46bedf7667 more tweaks to hydra mappings 2015-11-02 13:35:49 -08:00
Howard Stearns
cdd150f24e Merge pull request #6158 from hyperlogic/tony/anim-sync-blend 
Synced blending for avatar movement animations
 2015-11-02 12:59:38 -08:00
Brad Hefta-Gaub
354157ccec Merge pull request #6272 from jherico/externals 
Try using the VS2010 build of the latest SDK.
 2015-11-02 12:26:35 -08:00
Anthony J. Thibault
2236573a9d Merge branch 'master' into tony/anim-sync-blend 2015-11-02 12:18:11 -08:00
Anthony Thibault
f896a84391 Merge pull request #6269 from AndrewMeadows/avatar-velocity 
proper avatar velocity for HMD motion
 2015-11-02 12:16:48 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
U-GAPOS\andrew
a77f888f15 more correct HMD offset correction velocity 2015-11-02 11:29:17 -08:00
Brad Davis
edf3e5b17a Try using the VS2010 builds from the new Sixense SDKs 2015-11-02 11:15:51 -08:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs 
Add functional.js library
 2015-11-02 11:10:19 -08:00
ericrius1
3019886344 Removing basketball hoop from reset scripts 
Hoop will be saved in SVO instead
 2015-11-02 11:08:06 -08:00
U-GAPOS\andrew
a545d770d8 fix bug preventing avatar motion in 2D mode 2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135 remove extra whitespace 2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52 route HMD-following through the physics simulation 2015-11-02 11:07:40 -08:00
Andrew Meadows
9b1b009b8b Merge pull request #6271 from sethalves/fix-seths-build 
get interface building on seth's linux box
 2015-11-02 11:02:08 -08:00
Seth Alves
c381da24a7 get interface building on my linux box 2015-11-02 10:42:06 -08:00
ericrius1
b067abe2d9 Added name to basketball hoop in reset scripts 2015-11-02 09:58:23 -08:00
Brad Hefta-Gaub
8431ef9b98 Merge pull request #6267 from jherico/externals 
Update external version of Sixense.
 2015-11-02 09:49:29 -08:00
samcake
543f322ffe Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-02 09:48:32 -08:00
Brad Davis
a79933b7f8 Merge pull request #6268 from ZappoMan/rightClickMenu 
add mouseClicked inputs vs mouseButton inputs
 2015-11-02 09:48:07 -08:00
Brad Hefta-Gaub
d9dd045886 better parameter name 2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub
c3a78ed151 cleanup 2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub
b00f572e1a add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag 2015-11-02 09:21:15 -08:00
Brad Davis
017e42bbc2 Update sixense SDK 2015-11-02 09:15:54 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub
0f78a0b301 Merge pull request #6266 from ZappoMan/rightClickMenu 
remove right click context menu until we can make it work with camera move better
 2015-11-02 07:43:22 -08:00
Brad Hefta-Gaub
70b9aa5ff1 remove right click context menu until we can make it work with camera move better 2015-11-02 07:42:52 -08:00
Howard Stearns
fc63fa6f7b Update comments, and don't continue through collisions after finding one for our avatar. 2015-11-01 18:55:43 -08:00
Howard Stearns
ea2971a24f Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-11-01 17:02:59 -08:00
Brad Davis
71a6e783e3 Merge pull request #6265 from ZappoMan/fixWarnings 
warnings fixes
 2015-11-01 16:16:17 -08:00
Brad Hefta-Gaub
92bcd9ca9e make oculus plugin use static glew 2015-11-01 15:48:01 -08:00
Brad Hefta-Gaub
b9d60e803b fix mac warning 2015-11-01 15:13:28 -08:00
Brad Hefta-Gaub
fe4a6fa2bf Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings 2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Davis
1e47a53603 Fixing mac oculus crash 2015-11-01 14:34:03 -08:00
Brad Hefta-Gaub
13e805ac15 replace copy_resolved_item_into_bundle with a version that doesn't report warnings for a status case 2015-11-01 13:18:53 -08:00