Commit graph

47278 commits

Author SHA1 Message Date
Ryan Huffman
80b53a30d7 Fix success sound for tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
8d2f558ac3 Add proper cleanup on start of tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
4adc83da84 Temporarily disable begin area for tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
d8f7850976 Update tutorial to use new fireworks 2016-10-07 10:30:18 -07:00
Ryan Huffman
92670ed001 Update tutorial to work with fire 2016-10-07 10:30:18 -07:00
Ryan Huffman
3fb3e5cf4c Update controller display to cleanup properly when taking HMD off 2016-10-07 10:30:18 -07:00
Ryan Huffman
3886bcaa73 Fix teleport overlay 2016-10-07 10:30:18 -07:00
Ryan Huffman
b3205a6513 Fix teleport overlay on controller 2016-10-07 10:30:18 -07:00
Ryan Huffman
dee389e204 Fix tutorial sounds 2016-10-07 10:30:18 -07:00
Ryan Huffman
7bbf9bebec Tweak tutorial and controllers 2016-10-07 10:30:18 -07:00
Ryan Huffman
170502e8a1 Update controller display part implementation to only have a single layer active 2016-10-07 10:30:18 -07:00
Ryan Huffman
f8fdbe5499 Fix sound position 2016-10-07 10:30:18 -07:00
Ryan Huffman
3149bb834d Fix typo in vive controller display 2016-10-07 10:30:18 -07:00
Ryan Huffman
352f0f7ea7 Update controller model URL 2016-10-07 10:30:18 -07:00
Ryan Huffman
324365deca Add controller part hiding/showing depending on step 2016-10-07 10:30:18 -07:00
Ryan Huffman
7d57c06313 Add welcome to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
2bbc4204b9 Add support for parts to controller display" 2016-10-07 10:30:18 -07:00
Ryan Huffman
6f457e10eb Add trigger part to vive controller display 2016-10-07 10:30:18 -07:00
Ryan Huffman
52120de44a Disable displaying of overlays at end of tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
827506e929 Disable 180 spin in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
d3885b607d Add disabling of right-click menu in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
a4ffa7b23f Add disabling of right click menu with vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
eb195e2fb8 Add success sound 2016-10-07 10:30:18 -07:00
Ryan Huffman
a89064f96f Update startTutorial to move avatar to start location 2016-10-07 10:30:18 -07:00
Ryan Huffman
0d5017b5dd Add restartStep to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
f937b57070 Add left/right annotations 2016-10-07 10:30:18 -07:00
Ryan Huffman
f4f2ec5da8 Make adjustments to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
e8a1f50aee Ready for user testing v1 2016-10-07 10:30:18 -07:00
Ryan Huffman
5d9cc4782d Fix annotations 2016-10-07 10:30:18 -07:00
Ryan Huffman
de757698ea Disable ray picking against invisible objects in far grab and teleport 2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -07:00
Ryan Huffman
a1280d0958 Update vive controller model 2016-10-07 10:30:18 -07:00
Ryan Huffman
ea71ef91b6 Modify tutorial to adjust visiblity of tutorial entities 2016-10-07 10:30:18 -07:00
Ryan Huffman
8ba03abce6 Add tutorial and vive controller script 2016-10-07 10:30:18 -07:00
Ryan Huffman
14323a06b3 Add interface to disable hand controller grab functionality 2016-10-07 10:30:18 -07:00
Howard Stearns
a170436c8c Merge pull request #8754 from howard-stearns/init-script-update-time
init the accumulator for script elapsed time
2016-10-07 10:10:16 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window
Update the help window
2016-10-07 10:01:47 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
2016-10-07 09:56:30 -07:00
howard-stearns
6cae62f584 init the accumulator for script elapsed time 2016-10-07 09:38:30 -07:00
David Kelly
ab6ccac631 Merge pull request #8741 from howard-stearns/kill-agents
kill agents in avatar mixer when they stop being avatars
2016-10-07 09:16:49 -07:00
Seth Alves
f1f8f6323a Merge pull request #8674 from ctrlaltdavid/21055
HMD keyboard
2016-10-07 06:21:36 -07:00
David Rowe
52fbb654fa Tweak location of users online minimize/maximize button 2016-10-07 15:43:54 +13:00
David Rowe
c76bb01359 Make Interface title say if user not logged in 2016-10-07 15:39:46 +13:00
David Rowe
c637649805 Make users online title say to login to view 2016-10-07 15:25:47 +13:00
David Rowe
4ca0048ec9 Display minimized users list when not logged in 2016-10-07 15:21:24 +13:00
Brad Hefta-Gaub
b1cd553074 Merge pull request #8752 from huffman/fix/script-resolve
Fix script paths not resolving correctly
2016-10-06 18:55:57 -07:00
David Rowe
a1458a26fd Merge branch 'master' into 21055
Conflicts:
	libraries/gl/src/gl/OffscreenQmlSurface.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-07 14:44:23 +13:00
Brad Hefta-Gaub
b0c2bda898 Merge pull request #8743 from jherico/qml_threading
Remove QML threaded rendering
2016-10-06 17:46:12 -07:00
Ryan Huffman
bbd7174d06 Fix script paths not resolving correctly 2016-10-06 17:37:47 -07:00
David Rowe
bdff71151d Updates from code review 2016-10-07 13:35:44 +13:00