Commit graph

48308 commits

Author SHA1 Message Date
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
howard-stearns
b9a24cc56d Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-27 14:56:03 -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
David Kelly
5e4f539144 AudioMixer flushes now
And protected agent from case with no codec
2016-10-27 14:46:04 -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
David Kelly
d00a73dde1 Play the flushed encoder sound at end
Basically 0-padding the end of the sound buffer.  Next do that in
AudioMixer and we should be good.
2016-10-27 14:27:15 -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
howard-stearns
f0316e7bcc Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-27 13:47:20 -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
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -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
Seth Alves
edb3faac78 quiet warning 2016-10-27 12:55:32 -07:00
howard-stearns
59630f8eca Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-27 12:32:46 -07:00
howard-stearns
1efef36e03 spread out the start/stop of crowds, and allow control over how many are
listening
2016-10-27 12:31:36 -07:00
howard-stearns
237870d7c4 spread out the start and stop of crowds 2016-10-27 12:31:10 -07:00
howard-stearns
d69ea6b252 allow crowd-agent STOP command to take a delay time before it acts 2016-10-27 12:29:04 -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
Ryan Huffman
1782f97dbd Fix away.js not unsubscribing on shutdown 2016-10-27 11:12:46 -07:00