Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 13:53:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44110 commits 76 branches 59 tags 1.2 GiB
Commit graph

44110 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
b4543cc579 Unhighlight directory in table when type filename to save 2016-06-09 16:29:15 +12:00
David Rowe
0fe93a1e89 Fix capitalization of import and export dialog titles 2016-06-09 16:12:11 +12:00
David Rowe
3780b18cc0 Fix a QML error 2016-06-09 15:15:32 +12:00
David Rowe
0ef13e6c01 Fix action button label to be "Save" when saving a file 2016-06-09 15:15:31 +12:00
David Rowe
4ae018400d Give table focus after using dropdown 2016-06-09 15:15:30 +12:00
David Rowe
358355cfbf Clear file selection and disabled Open button when change directory 2016-06-09 15:15:29 +12:00
Anthony J. Thibault
5ef6847dc3 HMD re-centering while driving improvements. 
Previously the HUD fading in/out would also recenter the hmd sensor and the avatar, which caused many problems including:
  * The user's view could shift vertically.
  * Your avatar would briefly go into t-pose
  * other users would see your avatar go into t-pose.

Now we now move the UI sphere instead, which results in a much smoother experience.

MyAvatar: added hasDriveInput method.

OverlayConductor:
* removed avatar and sensor reset, instead the overlay's modelTransform is changed.
* revived STANDING mode, which is active if myAvatar->getClearOverlayWhenDriving() is true and you are wearing an HMD.
* SITTING & FLAT mode should be unchanged.
* Instead of using avatar velocity to fade out/fade in the hud, We use the presense or absanse of avatar drive input.
* Additionally, we check distance to the UI sphere, and quickly recenter the hud if the users head is too close to the actual hud sphere.

CompositorHelper:
* Bug fixes for ray picks not using the modelTransform.

HmdDisplayPlugin:
* Bug fixes for rendering not using the modelTransform.
 2016-06-08 18:36:36 -07:00
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
Brad Hefta-Gaub
262e0262fc Merge pull request #7889 from samcake/color 
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
 2016-06-08 17:38:45 -07:00
Zach Pomerantz
9926c80917 Only check user metadata before sending 2016-06-08 18:45:01 -05:00
Brad Hefta-Gaub
fc5214c938 Merge pull request #8033 from SamGondelman/xboxFix 
Game pads work after falling asleep and being reactivated
 2016-06-08 16:27:26 -07:00
Brad Hefta-Gaub
8434aa9416 Merge pull request #8027 from SamGondelman/exposeHaptics 
Expose haptics to JS
 2016-06-08 16:17:04 -07:00
Seth Alves
2e940e1055 Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entity-locking 2016-06-08 15:54:12 -07:00
Seth Alves
f070708b4a _avatarEntityData is accessed by more than one thread. 2016-06-08 15:53:54 -07:00
Anthony Thibault
05ca715074 Merge pull request #7974 from hyperlogic/tony/daz3d-model-fix 
Fix for models exported from Daz3D.
 2016-06-08 15:44:50 -07:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Anthony J. Thibault
42068cf2dd Only render equip-hotspots for objects with attach points. 2016-06-08 15:01:53 -07:00
Brad Davis
0565d3aea1 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-08 14:59:58 -07:00
Seth Alves
a312218722 back out some changes 2016-06-08 14:07:16 -07:00
Brad Hefta-Gaub
4e418f328f Merge pull request #7924 from imgntn/moreshelfstuff 
[Home] Add More Content
 2016-06-08 13:53:26 -07:00
Seth Alves
d7fc789ea7 try harder to not do simple-simulation on things that have an avatar ancestor 2016-06-08 13:47:52 -07:00
James B. Pollack
65e2cdbbf3 clear dead code 2016-06-08 13:44:53 -07:00
Brad Hefta-Gaub
0df72548f8 Merge pull request #8024 from kencooke/audio-src-avx2 
AVX2 optimized audio resampler
 2016-06-08 12:43:52 -07:00
Seth Alves
a1766539f4 don't do simple simulation on children of avatars 2016-06-08 12:17:07 -07:00
Seth Alves
201d7a7d3b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 12:11:08 -07:00
Seth Alves
5cbaf05e45 also zero angular velocity for child of avatar 2016-06-08 11:55:17 -07:00
howard-stearns
3138c4041b Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-08 11:54:00 -07:00
Seth Alves
1b4b38c85b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 11:28:49 -07:00
Howard Stearns
b21fbe5d99 Merge pull request #8037 from howard-stearns/button-content 
new hmd button content and initial positions
 2016-06-08 11:28:26 -07:00
Howard Stearns
7588579ec3 Merge pull request #8026 from jherico/steamvr_keyboard 
SteamVR keyboard functionality
 2016-06-08 11:21:07 -07:00
howard-stearns
f8353fb082 New button content and initial positions. 2016-06-08 11:11:18 -07:00
howard-stearns
bd24a07750 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-08 10:50:03 -07:00
Brad Davis
40778d7f29 Allow env disabling of the keyboard. Show keyboard after short delay to avoid flickers 2016-06-08 10:41:19 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Seth Alves
8085266c1d cause names in permissions tables to be alpha-sorted 2016-06-08 10:36:44 -07:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Howard Stearns
8bf6ed8b7a Merge pull request #8025 from hyperlogic/feature/vive-ui-equip-hotspot 
Render equip hotspot when trigger is squeezed
 2016-06-08 09:42:33 -07:00
Brad Hefta-Gaub
d0e946c907 Merge pull request #8034 from ctrlaltdavid/20953 
fix colors of buttons in Asset Browser dialog
 2016-06-08 07:47:34 -07:00
Brad Davis
79c68b2ecb Working on positioning of the keyboard 2016-06-07 21:52:22 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Hefta-Gaub
338557358d Merge pull request #8035 from Atlante45/master 
Fix OS X warning
 2016-06-07 18:17:58 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
SamGondelman
2c1d20bd1a removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks 2016-06-07 17:12:24 -07:00
Brad Hefta-Gaub
9a0076d4f1 Merge pull request #8028 from ctrlaltdavid/20949 
add "Load Defaults" button to Running Scripts dialog
 2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9 Merge pull request #8029 from SamGondelman/constantTurn 
Fixed constant turn of 22.5 degrees in comfort mode
 2016-06-07 17:09:07 -07:00
Anthony J. Thibault
30d8ae36e8 Added MyAvatar.characterControllerEnabled property 2016-06-07 16:55:32 -07:00
Atlante45
71fb0e665f Fix OSX warning 2016-06-07 16:46:32 -07:00