Ryan Huffman
b8cf4e9c0e
Merge pull request #8943 from ctrlaltdavid/21090
...
QA READY: Revise loading progress bar
2016-10-28 08:24:40 -07:00
David Rowe
b548e6441c
Animate progress bar without regard for amount of content left to load
2016-10-28 18:57:54 +13:00
David Rowe
610159fcbe
Improve bar for 4K displays
2016-10-28 18:20:33 +13:00
David Rowe
73b2bc433d
Improve bar positions
2016-10-28 18:03:13 +13:00
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
David Rowe
edc9b1fa07
Update bar graph for desktop and HMD displays
2016-10-28 15:50:50 +13:00
David Rowe
c9e4fddeab
Remove background image
2016-10-28 14:17:18 +13:00
David Rowe
0824142987
Add "loading" text
2016-10-28 14:12:24 +13:00
David Rowe
4befab1151
JSLint progress bar code
2016-10-28 11:34:00 +13:00
Ryan Huffman
69e7dababc
Collapse multiline dict to one line in controllerDisplay
2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380
Remove annotation API from controller display
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
e9099b77a5
Add more debug to tutorial, new firecrackers, and adjust fuse
2016-10-27 14:58:20 -07:00
Ryan Huffman
1782f97dbd
Fix away.js not unsubscribing on shutdown
2016-10-27 11:12:46 -07:00
Ryan Huffman
a801832a55
Fix away.js allowing any user to disable away.js
2016-10-27 11:12:31 -07:00
Howard Stearns
047b02141f
Merge pull request #8908 from howard-stearns/improve-domain-check
...
Improve domain check
2016-10-25 19:45:37 -07:00
Howard Stearns
58d14decbb
linting
2016-10-25 19:07:52 -07:00
Howard Stearns
d8c5cdd910
fix reporting
2016-10-25 18:42:04 -07:00
howard-stearns
f7742b99a9
update crowd-agent reference
2016-10-25 15:35:11 -07:00
howard-stearns
65ac73bfc0
use s3 instead of gh-pages
2016-10-25 15:29:48 -07:00
Ryan Huffman
727fabeab2
Fix away.js logging all Messages
2016-10-25 15:28:11 -07:00
howard-stearns
6116060858
Merge branch 'master' of https://github.com/highfidelity/hifi into improve-domain-check
2016-10-25 14:58:58 -07:00
howard-stearns
9561142c43
improvements
2016-10-25 14:58:27 -07:00
howard-stearns
2fbb2338c5
don't complain about other's finishedSound messages
2016-10-25 14:56:05 -07:00
Ryan Downe Karpf
7a4302057a
Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip
...
Update vive controller display to not hide on equip
2016-10-25 13:16:31 -07:00
Brad Hefta-Gaub
1bbf0179dd
Merge pull request #8894 from ZappoMan/xboxLasers
...
Adds support for "lasers" to the Oculus+xbox controller
2016-10-25 09:18:00 -07:00
Ryan Huffman
af749605ea
Update vive controller display to not hide on equip
2016-10-25 08:27:20 -07:00
Chris Collins
325cd0ae61
Merge pull request #8870 from ctrlaltdavid/21084
...
Reinstate "reload" button for entity scripts in entities editor
2016-10-24 22:17:14 -07:00
Brad Hefta-Gaub
ed4279783d
CR feedback
2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
76ca3aa546
fix residual head laser
2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub
779f326452
cleanup
2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e
gak
2016-10-24 14:47:10 -07:00
Brad Hefta-Gaub
0f8967970a
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546
more work on extra lasers
2016-10-24 07:46:04 -07:00
Brad Hefta-Gaub
ee1f3ac38c
Merge pull request #8881 from jherico/offscreen_texture_memory_stats
...
Report offscreen texture memory usage in stats
2016-10-21 19:15:59 -07:00
Anthony J. Thibault
ae301602e7
Fix for incorrect tip texture URLs.
2016-10-21 14:49:46 -07:00
Anthony J. Thibault
c431c69d60
Merge branch 'master' into feature/controller-display
2016-10-21 13:48:07 -07:00
Brad Davis
1bd398ae5e
Report offscreen texture memory usage in stats
2016-10-21 11:31:37 -07:00
Anthony J. Thibault
60f728585a
away.js now shows hand controllers in away mode.
...
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
2016-10-21 10:40:39 -07:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc
Merge pull request #8867 from jherico/offscreen_textures
...
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 17:07:29 -07:00
Howard Stearns
ca0d6587b5
Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers
...
edit.js: Fix for picking and manipulating objects via hand controllers.
2016-10-20 16:59:56 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Chris Collins
414a79d986
Merge pull request #8868 from huffman/fix/away-overlays
...
Remove showing of overlays in away.js
2016-10-20 16:42:05 -07:00
David Rowe
c6558ebebd
Reinstate "reload" button for entity scripts in entities editor
2016-10-21 11:14:57 +13:00
Seth Alves
96445f4dee
Merge pull request #8861 from hyperlogic/feature/crowd-agent-attachment
...
Added attachment support to crowd-agent
2016-10-20 13:44:25 -07:00
Anthony J. Thibault
53864abaf2
edit.js: Fix for picking and manipulating objects via hand controllers.
...
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
2016-10-20 13:37:31 -07:00
Brad Davis
9523660027
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 11:55:25 -07:00
Ryan Huffman
fad0607bf6
Remove showing of overlays in away.js
2016-10-20 11:49:23 -07:00
