Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-16 13:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43706 commits 6 branches 1 tag 1.1 GiB
Commit graph

43706 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
2e71a63574 cr fixes 2016-06-07 13:28:10 -07:00
SamGondelman
ff2405437b can set strength to 0 2016-06-07 12:19:38 -07:00
SamGondelman
7a3cba8580 warning be gone 2016-06-06 17:06:59 -07:00
SamGondelman
8fa52fa159 trying to fix warning in joystick.cpp 2016-06-06 16:48:21 -07:00
SamGondelman
b59d597780 if overlapping calls, haptics take on strength and duration of call that will finish last 2016-06-06 15:35:12 -07:00
SamGondelman
cea0d74c35 fix spaces and touch duration 2016-06-06 15:20:10 -07:00
SamGondelman
e7743cd8e2 added options for both hands (default), all devices, short pulse, and fixed touch timing mechanism 2016-06-06 15:03:08 -07:00
SamGondelman
afca0ec2c9 moved vive pulses to correct thread, works with duration 2016-06-06 13:25:05 -07:00
SamGondelman
b01a00584a Merge branch 'exposeHaptics' of https://github.com/SamGondelman/hifi into exposeHaptics 2016-06-06 10:35:29 -07:00
SamGondelman
f51cb7ce0c trying to add duration support for vive 2016-06-06 10:34:32 -07:00
SamGondelman
c1eab61241 sdl haptics aren't working, but might be a bug in sdl: http://stackoverflow.com/questions/23974908/why-is-sdl-hapticopenfromjoystick-not-working-in-sdl-2 2016-06-03 11:22:06 -07:00
SamGondelman
e2c4b4d306 added haptic support to sdl and touch (needs testing) 2016-06-03 10:17:08 -07:00
SamGondelman
912b35693b added vive single pulse haptics 2016-06-02 18:13:33 -07:00
SamGondelman
69971a3439 fix one more tab 2016-06-02 12:20:05 -07:00
SamGondelman
642438a259 fix tabs 2016-06-02 12:18:56 -07:00
SamGondelman
6ca02dcad2 expose Controller.triggerHapticPulse to javascript (currently does nothing) 2016-06-02 12:11:13 -07:00
Brad Hefta-Gaub
35b80ba066 Merge pull request #7990 from ZappoMan/revert7943 
Revert PR-7943
 2016-05-31 21:21:12 -07:00
Brad Hefta-Gaub
3119b654dc additional revert related change 2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222 Revert "refresh API info during re-connect - case 570" 
This reverts commit e8d7f9614a.
 2016-05-31 20:39:16 -07:00
Brad Hefta-Gaub
cb3dfa0457 Merge pull request #7983 from ZappoMan/fixShapes 
fix shapes to property polymorph and persist
 2016-05-27 17:56:25 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Brad Hefta-Gaub
76940bad34 Merge pull request #7897 from howard-stearns/reset-hud-on-driving 
reset hud on driving
 2016-05-27 10:40:12 -07:00
Howard Stearns
5b6660e7ea Default preference to false. 2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-27 10:32:01 -07:00
Howard Stearns
abd2b150f5 Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving 2016-05-27 10:31:42 -07:00
Chris Collins
3e79b67612 Merge pull request #7977 from hyperlogic/bug-fix/avatar-lod 
Bugfix for avatar LOD
 2016-05-27 10:15:26 -07:00
Andrew Meadows
1132b4666a Merge pull request #7975 from jherico/shared_shapes 
Moving shape definition to a shared location
 2016-05-27 07:28:11 -07:00
Chris Collins
8ad572a269 Merge pull request #7976 from birarda/session-id-with-place-request 
send session ID in AccountManager without curly braces
 2016-05-26 15:59:18 -07:00
Brad Davis
6a962d7aab Unix build fix 2016-05-26 15:51:36 -07:00
Stephen Birarda
1ec421350d send the UUID session ID without curly braces 2016-05-26 14:56:51 -07:00
Anthony J. Thibault
b4d14f06d8 Bugfix for avatar LOD 
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
 2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-26 13:52:23 -07:00
Chris Collins
4120ed9f0b Merge pull request #7964 from ZappoMan/protocolVersionCheck 
check for all protocols matching when connecting to a domain
 2016-05-26 13:02:18 -07:00
Brad Davis
2c02c963d4 Moving shape definition to a shared location 2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
88813c47f0 Merge pull request #7960 from howard-stearns/fix-hand-controllers-after-input-changes 
Fix hand controller pointer after input changes.
 2016-05-26 12:16:23 -07:00
Brad Hefta-Gaub
8ec425106a Merge pull request #7968 from birarda/audio-is-playing 
fix collision of isPlaying property and slot for AudioInjectors
 2016-05-26 12:06:00 -07:00
howard-stearns
991da9e248 fix cut-paste error in settings. 2016-05-26 09:51:55 -07:00
Howard Stearns
029c76f489 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-25 20:40:03 -07:00
Howard Stearns
8e6853bec6 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes 2016-05-25 18:54:29 -07:00
Brad Hefta-Gaub
485c8aceac Merge pull request #7942 from sethalves/fix-edit-js-restart 
fix a race that keeps some scripts from restarting
 2016-05-25 17:22:17 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request 
optionally include the metaverse session ID as HTTP header when sending usage data
 2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
Brad Hefta-Gaub
7131920312 Merge pull request #7966 from ctrlaltdavid/20932 
make file dialog resizable and movable
 2016-05-25 17:13:55 -07:00
Brad Hefta-Gaub
0a96b144e3 Merge pull request #7970 from birarda/api-recheck-on-fail 
clear AddressManager previous lookup on 404
 2016-05-25 17:13:44 -07:00
samcake
b76cda3c89 Merge pull request #7945 from Geenz/20901 
20901: Add Range Based Light Attenuation
 2016-05-25 16:39:01 -07:00
Brad Hefta-Gaub
84f541285f Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-25 15:01:15 -07:00
Seth Alves
3184304179 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 14:14:09 -07:00
Seth Alves
cb40cfbead Merge pull request #7972 from jherico/entity_shape_protocol_fix 
Fix broken protocol for shapes
 2016-05-25 14:13:15 -07:00
Seth Alves
7d4462ba81 Merge branch 'entity_shape_protocol_fix' of github.com:jherico/hifi into fix-edit-js-restart 2016-05-25 13:54:33 -07:00