David Rowe
|
49709b42d7
|
Merge branch 'master' into 21070
|
2016-10-12 09:45:34 +13:00 |
|
David Rowe
|
31b35f0a35
|
Only raise keyboard if in HMD display mode
|
2016-10-12 09:43:33 +13:00 |
|
Andrew Meadows
|
abb05bc686
|
Merge pull request #8753 from ctrlaltdavid/21068
Improve indication of user not being logged in
|
2016-10-11 10:40:37 -07:00 |
|
Howard Stearns
|
48c168fa73
|
Merge pull request #8769 from sethalves/avoid-ds-ice-metaverse-race
fix domain-server update metaverse bug
|
2016-10-11 10:04:12 -07:00 |
|
David Kelly
|
c664c7192e
|
Merge pull request #8759 from howard-stearns/crowd-update
update for sound
|
2016-10-10 16:03:10 -07:00 |
|
Brad Hefta-Gaub
|
774d87a7a7
|
Merge pull request #8773 from howard-stearns/marketplace-button-state
make marketplace button state match whether tablet is being shown
|
2016-10-10 15:50:07 -07:00 |
|
Seth Alves
|
e9961110e9
|
if we have new ice-server information, retry right away, even if the previous attempt failed
|
2016-10-10 15:40:59 -07:00 |
|
Seth Alves
|
06db46e38a
|
Merge branch 'master' of github.com:highfidelity/hifi into avoid-ds-ice-metaverse-race
|
2016-10-10 15:37:41 -07:00 |
|
Brad Hefta-Gaub
|
a877f182f7
|
Merge pull request #8771 from howard-stearns/kick-by-laser
fix kick by laser
|
2016-10-10 15:36:16 -07:00 |
|
Brad Hefta-Gaub
|
d661ae5638
|
Merge pull request #8766 from ZappoMan/depthReticleFixes
fix reticle depth when not moving mouse, but moving head relative to HUD
|
2016-10-10 15:15:20 -07:00 |
|
Brad Hefta-Gaub
|
798a5cfc9d
|
Merge pull request #8768 from ZappoMan/nestedSkyboxes
fix skybox changing when going between zones
|
2016-10-10 15:13:33 -07:00 |
|
David Rowe
|
552f276a06
|
Load avatar browser dialog such that JavaScript EventBridge works
|
2016-10-11 11:12:57 +13:00 |
|
Brad Hefta-Gaub
|
6c63213c78
|
Merge pull request #8772 from hyperlogic/bug-fix/web-entity-crash
Crash fix for RenderableWebEntityItem::buildWebSurface
|
2016-10-10 14:38:05 -07:00 |
|
howard-stearns
|
333ec388a8
|
make marketplace button state match whether tablet being shown
|
2016-10-10 14:30:47 -07:00 |
|
David Rowe
|
d0900ec75e
|
Add keyboard to avatar browser dialog
|
2016-10-11 10:11:36 +13:00 |
|
Anthony J. Thibault
|
e76a7fc577
|
Crash fix for RenderableWebEntityItem::buildWebSurface
Gracefully handle the absence of a gl context. We will continue to retry every render call.
|
2016-10-10 13:57:54 -07:00 |
|
howard-stearns
|
1051c068e1
|
kick by hand controller
|
2016-10-10 13:47:08 -07:00 |
|
Seth Alves
|
9712301172
|
avoid a race that can cause metaverse to not have correct ice-server information about a domain
|
2016-10-10 11:54:33 -07:00 |
|
Chris Collins
|
2b8765b47e
|
Merge pull request #8765 from ctrlaltdavid/fix-address-bar
Fix address bar not being able to regain focus
|
2016-10-10 10:11:34 -07:00 |
|
Chris Collins
|
8e9b9ddc6f
|
Merge pull request #8764 from ctrlaltdavid/fix-login-keyboard
Fix virtual keyboard in login dialog
|
2016-10-10 09:50:05 -07:00 |
|
Brad Hefta-Gaub
|
735a6ca994
|
Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes
openvr deadlock and crash on exit fixes
|
2016-10-10 08:01:07 -07:00 |
|
Brad Hefta-Gaub
|
db5edb530a
|
fix skybox changing when going between zones
|
2016-10-09 15:22:35 -07:00 |
|
David Rowe
|
827c2b015b
|
Update other dialogs to use single keyboard QML file
|
2016-10-09 11:52:30 +13:00 |
|
Brad Hefta-Gaub
|
4ec9299930
|
fix reticle depth when not moving mouse, but moving head relative to HUD
|
2016-10-08 14:31:30 -07:00 |
|
Brad Hefta-Gaub
|
87d66ffdf8
|
Merge pull request #8756 from jherico/i5_reprojection
Turn on forced reprojection on i5 systems
|
2016-10-08 10:51:27 -07:00 |
|
David Rowe
|
12f4b2854d
|
Fix address bar not being able to regain focus
|
2016-10-08 19:38:57 +13:00 |
|
David Rowe
|
5a4665b02f
|
Combine numeric keys into alpha keyboard QML file for scrolling windows
|
2016-10-08 16:27:51 +13:00 |
|
David Rowe
|
b954852ba9
|
Use temporary copy of keyboard QML file while refactoring
|
2016-10-08 15:23:11 +13:00 |
|
Anthony J. Thibault
|
ec801cb9d8
|
Addressed feedback from code review.
|
2016-10-07 17:46:46 -07:00 |
|
David Rowe
|
a934f59c2a
|
Fix virtual keyboard in login dialog
|
2016-10-08 13:37:31 +13:00 |
|
Brad Davis
|
d8242f02a5
|
Merge pull request #8762 from jherico/stable_merge2
Stable merge2
|
2016-10-07 17:22:36 -07:00 |
|
Brad Davis
|
c6a890af40
|
Merge remote-tracking branch 'upstream/stable' into stable_merge2
|
2016-10-07 17:14:36 -07:00 |
|
Brad Hefta-Gaub
|
7e3d63c4e2
|
Merge pull request #8747 from jherico/buffer_page_fix
Fix page size usage in gpu buffers
|
2016-10-07 16:57:25 -07:00 |
|
Chris Collins
|
66924a7bb9
|
Merge pull request #8760 from huffman/fix/help-images
Update help window images
|
2016-10-07 16:07:41 -07:00 |
|
Ryan Huffman
|
6476dfecc6
|
Update help window images
|
2016-10-07 16:06:26 -07:00 |
|
Chris Collins
|
bde3a6d02a
|
Merge pull request #8627 from huffman/feat/tutorialv3
Tutorial
|
2016-10-07 15:52:25 -07:00 |
|
howard-stearns
|
7c5dd89372
|
typo
|
2016-10-07 15:27:58 -07:00 |
|
howard-stearns
|
c5f889a34d
|
update for sound
|
2016-10-07 15:13:37 -07:00 |
|
Ryan Huffman
|
abaa75245e
|
Temporarily remov touch controller configuration
|
2016-10-07 13:41:23 -07:00 |
|
Ryan Huffman
|
0f0ea5f73f
|
Remove dead code
|
2016-10-07 13:40:35 -07:00 |
|
Ryan Huffman
|
de14fdffb7
|
Remove commented log line
|
2016-10-07 13:38:18 -07:00 |
|
Ryan Huffman
|
8a4cfd4735
|
Remove unreachable code in PluginUtils
|
2016-10-07 13:37:52 -07:00 |
|
Brad Davis
|
8526ac74a5
|
Turn on forced reprojection on i5 systems
|
2016-10-07 13:36:49 -07:00 |
|
Anthony J. Thibault
|
a4c7e832b5
|
Reset threadID logging to false
|
2016-10-07 11:42:34 -07:00 |
|
Anthony J. Thibault
|
17d00ee3f9
|
Workaround openvr crash by calling Submit before VR_Shutdown
|
2016-10-07 11:41:58 -07:00 |
|
Ryan Huffman
|
c995e51128
|
Fix compilation bugs in Application
|
2016-10-07 10:30:18 -07:00 |
|
Ryan Huffman
|
56a5d82f4b
|
Cleanup tutorial.js and remove unused code
|
2016-10-07 10:30:18 -07:00 |
|
Ryan Huffman
|
a5e3fa45c3
|
Fix advanced movement being disabled
|
2016-10-07 10:30:18 -07:00 |
|
Ryan Huffman
|
b839926396
|
Remove unnecessary lambda for location initialization on startup
|
2016-10-07 10:30:18 -07:00 |
|
Ryan Huffman
|
d589812c52
|
Update hand controller detection
|
2016-10-07 10:30:18 -07:00 |
|