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

20841 commits

Author SHA1 Message Date
Zach Pomerantz
0075d8619a center MUTED text in InputLevel 2017-06-20 17:04:54 -07:00
Zach Pomerantz
1f7e1e8287 add level to active input selection 2017-06-20 17:04:54 -07:00
Atlante45
6bd1946e96 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-06-20 16:36:57 -07:00
Zach Pomerantz
baafe1ad09 give Audio menu mute its own row 2017-06-20 16:15:05 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level 
Update chrome for the audio input level meter
 2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391 Merge pull request #10744 from zzmp/audio/output-sample 
Add "Play sample sound" to audio setting
 2017-06-20 15:32:57 -07:00
Zach Pomerantz
278a122291 bring visibleChanged to standard 2017-06-20 14:04:50 -07:00
howard-stearns
41003bd307 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-20 13:25:38 -07:00
howard-stearns
480ff784b9 add a skipTutorial option, that does not change settings 2017-06-20 13:25:03 -07:00
Zach Pomerantz
dc6542c615 fix typo 2017-06-20 12:20:49 -07:00
Zach Pomerantz
6823e7cae0 Audio -> HifiAudio to avoid collision 2017-06-20 12:20:14 -07:00
Zach Pomerantz
8d4307460c Audio -> HifiAudio to avoid collision 2017-06-20 12:19:42 -07:00
Zach Pomerantz
f55d842fac add SoundCache to tablet for PlaySampleSound 2017-06-20 12:16:08 -07:00
Zach Pomerantz
6c776e27af fix PlaySampleSound glyphs 2017-06-20 12:16:08 -07:00
Zach Pomerantz
ab6c8505b8 stop audio sample on visibleChanged 2017-06-20 12:15:23 -07:00
Matti Lahtinen
256484cd21 Removed Whitespace 2017-06-20 21:44:32 +03:00
Zach Pomerantz
c33853f4cf update AvatarInputs with MicBar 2017-06-20 11:43:02 -07:00
Zach Pomerantz
ab68c44177 MicBar tweaks 2017-06-20 11:43:02 -07:00
Zach Pomerantz
8436d0cc6b rm unused AvatarInputs props 2017-06-20 11:43:02 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub
cbded766b1 Merge pull request #10676 from NeetBhagat/21369 
WL 21369 - Implement parts of the JS "console" object
 2017-06-20 11:06:34 -07:00
Zach Pomerantz
7f90f8af45 Merge pull request #10746 from zzmp/audio/mute-check 
Emphasize mute state with red
 2017-06-20 10:58:11 -07:00
Anthony J. Thibault
29e3af820b Fix for avatars with no eyes. 
The calculation of the centerEyeCalibration matrix (and several others) were incorrect.
 2017-06-20 10:14:34 -07:00
howard-stearns
d71666f337 Remove useless command line arg for steam, but add one for version. 2017-06-20 09:59:15 -07:00
howard-stearns
974768390c Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-20 09:47:52 -07:00
Anthony J. Thibault
21c0e45d87 recenter rotation while driving. 
This should reduce foot sliding in HMD mode.
 2017-06-20 09:43:38 -07:00
druiz17
a5913af9b4 Merge pull request #10737 from vladest/fix_audio_qt59 
Fix audio qt59
 2017-06-20 09:41:58 -07:00
Dante Ruiz
33b89c9d32 adding glyph and text 2017-06-20 17:26:17 +01:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Zach Pomerantz
497ee3a522 add Audio.inputLevel 2017-06-19 17:07:43 -07:00
Zach Pomerantz
4bff925506 rm unused bools 2017-06-19 17:01:39 -07:00
Anthony J. Thibault
c236afe68c Simplify passing data from MySkeletonModel to Rig 2017-06-19 16:54:39 -07:00
Zach Pomerantz
3d80774317 clean up select_audio_device 2017-06-19 15:57:24 -07:00
Zach Pomerantz
837f37220a log selected_audio_device 2017-06-19 15:11:02 -07:00
Zach Pomerantz
5f236bd025 simplify device settings 2017-06-19 15:11:02 -07:00
Zach Pomerantz
7512332104 replace mic-mute icons with red variants 2017-06-19 15:07:28 -07:00
Zach Pomerantz
6adfe34661 make mute red check 2017-06-19 15:07:28 -07:00
Zach Pomerantz
5c0e9e7496 improve wording for MyAvatar.qmlPosition doc 2017-06-19 14:52:32 -07:00
Zach Pomerantz
f0bc080502 fix tab 2017-06-19 14:51:30 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Zach Pomerantz
d3d36324c0 play sample output sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
071a8a783c add sample sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
1bf16c4318 update fonts 2017-06-19 14:41:00 -07:00
howard-stearns
91656a5fe5 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-19 14:22:12 -07:00
Zach Fox
2e215e6544 Fix build problems 2017-06-19 14:04:51 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
howard-stearns
c6d66d439b report and quit command line switches 2017-06-19 12:57:26 -07:00
Matti Lahtinen
82df64d5e7 flyingAllowed to zoneAllowsFlying 2017-06-19 21:44:43 +03:00
Seth Alves
39fb94d76d fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-19 11:21:08 -07:00
Zach Fox
5245237bb2 Removing unmergeable files before PR 2017-06-19 10:33:22 -07:00
Zach Fox
08eb07242d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-19 10:31:31 -07:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
Vladyslav Stelmakhovskyi
36ff765d7f Make sure registered object have different name from iport alias 2017-06-18 22:19:28 +02:00
Vladyslav Stelmakhovskyi
59a77c16bd Cleanup 2017-06-18 20:59:22 +02:00
Matti Lahtinen
600a39c9b2 Fixed Zone overriding Client. 2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi
f34faa3ee7 Fix backward compatibility with Qt 5.6 2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f Forgot if statement 2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca Merge branch 'master' into fix_tablet_buttons_qt59 2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c Send mouse events before touch event. It seems the order is important for Qt 5.9 2017-06-17 22:24:27 +02:00
Howard Stearns
532df863b9 Merge pull request #10726 from zfox23/PAL_FixGoToUser 
Fix teleporting to another user from the PAL
 2017-06-16 18:08:11 -07:00
Anthony J. Thibault
323dc62ef2 Merge branch 'master' into feature/pole-vector 2017-06-16 17:37:11 -07:00
Brad Davis
0af6b3b749 Merge pull request #10719 from ctrlaltdavid/21397 
Ensure desktop dialogs' title bars are visible
 2017-06-16 17:35:18 -07:00
Anthony J. Thibault
e7991579ef Enabled elbow pole vectors 
There are still some issues with rotations of the elbow pole vectors.
* When the (hand - shoulder) vector approaches the normal vector used in Rig::calculateElbowPoleVector() unexpected twists can occur.
* Also, when the (hand - shoulder) vector approaches zero, the IK system starts to flutter between two states.
* The shoulder twist constraint probably needs to be opened up for more natural range of motion.
 2017-06-16 17:29:56 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Dante Ruiz
2015f059c7 fixed hand calibration 2017-06-17 00:37:33 +01:00
Zach Fox
6230dcf93d Thanks to Thoys! 2017-06-16 16:34:35 -07:00
Zach Fox
74fde8efd7 Revert "Fix teleporting to another user from the PAL" 
This reverts commit 6b659101d5.
 2017-06-16 15:33:47 -07:00
Zach Fox
6b659101d5 Fix teleporting to another user from the PAL 2017-06-16 15:09:13 -07:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Fox
749dede8b3 Start with empty string for checkbox 2017-06-16 10:08:58 -07:00
Zach Fox
3df414df36 Bugfixes and language changes 2017-06-16 10:08:58 -07:00
Zach Fox
8cf9c8708d Allow user to click left thumbstick to switch 'MONITOR SHOWS' 2017-06-16 10:08:58 -07:00
Zach Fox
416ebaa2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 10:08:10 -07:00
David Rowe
3cee2b3764 Ensure desktop dialogs' title bars are visible 2017-06-16 20:10:24 +12:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Dante Ruiz
07102cc98d improving the ui 2017-06-16 00:25:27 +01:00
Zach Pomerantz
eb4255e1ac fix audio checkbox bindings 2017-06-15 18:21:23 -04:00
Zach Pomerantz
3093a73ce1 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-15 15:04:06 -04:00
Zach Fox
47e5fb56d3 Show MyAvatar's head in the SpectatorCamera view! 2017-06-15 11:31:20 -07:00
Zach Fox
60549075dd Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-15 10:09:07 -07:00
ZappoMan
d352163d77 fix no audio device from previously removed audio device 2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
Dante Ruiz
a1782bf7d2 Merge branch 'controller-ui' into hand-pucks 2017-06-15 16:27:55 +01:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
druiz17
347f020b04 Merge pull request #10692 from jherico/fix_tablet_crash 
Fix crash on exit when tablet is open
 2017-06-15 08:15:02 -07:00
NeetBhagat
a6b1b17d45 Merge branch 'master' into 21369 2017-06-15 11:04:22 +05:30
Andrew Meadows
becb968a75 Merge pull request #10685 from ctrlaltdavid/21327-b 
Use HMD roll angle to turn while flying or walking in HMD
 2017-06-14 16:56:29 -07:00
Zach Fox
f214712b33 Merge pull request #10678 from zfox23/spectatorCamera_improvements1 
Secondary camera and rendering improvements
 2017-06-14 14:39:38 -07:00
David Rowe
16bebdd409 Rename identifiers 2017-06-15 09:20:55 +12:00
David Rowe
55e0082792 Code review 2017-06-15 09:10:08 +12:00
Zach Fox
6b6b6026a4 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-14 13:44:13 -07:00
Brad Davis
7a6df850c5 Fix crash on exit when tablet is open 2017-06-14 13:22:53 -07:00
Menithal
112f186304 Added minor Comments 2017-06-14 22:24:18 +03:00
Zach Fox
8a217acd2b Defaults for camera projection parameters 2017-06-14 12:19:38 -07:00
Zach Fox
03c61e2191 vFoV and clipping plane distances now come from config 2017-06-14 11:53:05 -07:00
Anthony J. Thibault
10f94c2d60 Fixed pole vectors on straight limbs by using reference vector 2017-06-14 11:35:53 -07:00