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

47822 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c41af25776 Merge pull request #8939 from huffman/fix/tutorial-fixes 
Tutorial fixes
 2016-10-27 21:43:55 -07:00
Ryan Huffman
d933155c71 Fix trigger highlight configuration 2016-10-27 20:16:34 -07:00
Brad Hefta-Gaub
4f6cbf762d Merge pull request #8942 from jherico/openvr_min_spec 
Updates for min spec check for Steam
 2016-10-27 20:08:35 -07:00
Brad Hefta-Gaub
97f622f003 Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains 
Fix for crash in QtWebEngineCore when rapidly switching domains
 2016-10-27 20:01:31 -07:00
Brad Davis
23fc865d40 Updates for min spec check 2016-10-27 19:28:46 -07:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains 
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
 2016-10-27 18:55:24 -07:00
Brad Hefta-Gaub
9126a7db80 Merge pull request #8921 from jherico/openvr_min_spec 
Display warning overlay instead of scene when below min spec
 2016-10-27 17:36:08 -07:00
Brad Davis
e9db8be435 Fix linux build 2016-10-27 16:51:52 -07:00
Howard Stearns
d2b83b47ba Merge pull request #8936 from zzmp/clean/audio-mixer 
clean audio mixer
 2016-10-27 15:57:16 -07:00
Howard Stearns
9a97867919 Merge pull request #8937 from zzmp/fix/agent-audio-underflow 
fix agent audio underflow
 2016-10-27 15:51:58 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -07:00
Ryan Huffman
69e7dababc Collapse multiline dict to one line in controllerDisplay 2016-10-27 15:16:38 -07:00
Ryan Huffman
5eef9867b4 Remove comment in tutorialZone 2016-10-27 15:04:00 -07:00
Ryan Huffman
47d7e89699 Update portal to ensure that properties exist 2016-10-27 15:03:15 -07:00
Ryan Huffman
7227e5770a Fix bug in tutorialZone using self instead of this 2016-10-27 15:02:57 -07:00
Ryan Huffman
e6d2900bec Loosen up the requirements for the turn step in the tutorial 2016-10-27 15:02:35 -07:00
Ryan Huffman
7b881a6be0 Add begin step to tutorial 2016-10-27 15:02:21 -07:00
Ryan Huffman
8a7f67c849 Cleanup client controller display implementation in tutorial 2016-10-27 15:02:03 -07:00
Ryan Huffman
d577493d5e Remove unneeded comments in tutorial scripts 2016-10-27 14:58:20 -07:00
Ryan Huffman
639911e11f Add extra logging to ownershipToken 2016-10-27 14:58:20 -07:00
Ryan Huffman
9207e882b1 Update butane lighter equip position in tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
acb44d021c Add HUD hiding to tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
c0e372c380 Remove annotation API from controller display 2016-10-27 14:58:20 -07:00
Ryan Huffman
b9bc9bb802 Update tutorial to disable away.js right away 2016-10-27 14:58:20 -07:00
Ryan Huffman
0234747ec3 Update editEntitiesWithTag to use static lookup table 2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f Update controller tips and trigger highlight in tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
eb541e09f9 Update tutorial error text to say 'Vive headset' instead of 'VR headset' 2016-10-27 14:58:20 -07:00
Ryan Huffman
97fbdc7c20 Fix issues in several tutorial scripts 2016-10-27 14:58:20 -07:00
Ryan Huffman
e58cd53fe5 Fix entity id for grip button model 2016-10-27 14:58:20 -07:00
Ryan Huffman
1f2b555a26 Add logging of show/hide/getByName in tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
d9e6491843 Add more debug to fuseCollider and spinner 2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5 Add more debug to tutorial, new firecrackers, and adjust fuse 2016-10-27 14:58:20 -07:00
Ryan Downe Karpf
614956a86b Merge pull request #8938 from Atlante45/splash 
Disable console splash screen
 2016-10-27 14:47:42 -07:00
Zach Pomerantz
428bb8e518 rm unused OffscreenQmlSurface const 2016-10-27 14:40:51 -07:00
Zach Pomerantz
a7d54b8e0a rm unused lastCutoffRatio 2016-10-27 14:38:17 -07:00
Zach Pomerantz
c14a928db5 convert size_t to int 2016-10-27 14:34:10 -07:00
Atlante45
4cb1d75ca4 Disable console splash screen 2016-10-27 14:12:17 -07:00
Brad Davis
012e215f62 Merge pull request #8922 from ZappoMan/report45hzTarget 
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
 2016-10-27 14:03:07 -07:00
Brad Hefta-Gaub
6d94df346f add async reprojection stat to oculus too 2016-10-27 14:00:30 -07:00
Zach Pomerantz
32040a9047 add stat for streams in audio mixer 2016-10-27 13:55:17 -07:00
Zach Pomerantz
68f05bee87 fix underflow for agent audio timer 2016-10-27 13:47:22 -07:00
Zach Pomerantz
20bac5aeef clean up broadcastMixes 2016-10-27 13:47:00 -07:00
Zach Pomerantz
9e9f8666ce clean up handleMismatchAudioFormat comment 2016-10-27 13:46:53 -07:00
Zach Pomerantz
04e5d8e302 initialize audio client data 2016-10-27 13:46:42 -07:00
Zach Pomerantz
3e16dabb75 fix audio mixer throttling 2016-10-27 13:46:33 -07:00
Clément Brisset
745f6546dd Merge pull request #8932 from huffman/fix/gamepad-help-image 
Update help image for gamepad to include grab and click lasers
 2016-10-27 13:31:15 -07:00
Brad Hefta-Gaub
bfe6ebb44f some tweaks 2016-10-27 12:04:46 -07:00
Ryan Huffman
aa3af36933 Merge pull request #8933 from huffman/fix/away-vulnerability 
Fix away.js vulnerability
 2016-10-27 11:55:36 -07:00
Brad Hefta-Gaub
510786bc0f Merge pull request #8923 from Atlante45/steamvr 
Add getter for SteamVR's buildID to SteamClient
 2016-10-27 11:38:35 -07:00
Brad Hefta-Gaub
c3f5df8f0b Merge branch 'master' of https://github.com/highfidelity/hifi into report45hzTarget 2016-10-27 11:36:56 -07:00