Brad Davis
0bc4beeffd
Fix initial toolbar positioning
2016-06-20 17:09:30 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
Bradley Austin Davis
5bc8b53d1b
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
d8d4eb65ec
Merge pull request #8059 from Atlante45/feat/steamworks
...
Initial Steamworks integration
2016-06-16 18:49:51 -07:00
Bradley Austin Davis
067539ff6d
Fix overlay stuck to face
2016-06-15 17:44:58 -07:00
Bradley Austin Davis
33e9caa636
Simplify overlay conductor, menu interation
2016-06-15 17:24:39 -07:00
Bradley Austin Davis
6ad1008a56
Allow explicit overlay alpha from scripts
2016-06-15 17:24:32 -07:00
Bradley Austin Davis
bc838ac0b4
Fix vive json
2016-06-15 11:41:28 -07:00
Bradley Austin Davis
0b0977f362
Support keyboard suppresion, control suppresion while in keyboard mode
2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-15 10:45:51 -07:00
David Rowe
657f8fdad5
Fix reporting of JSON export failure
2016-06-15 14:12:49 +12:00
Atlante45
1403fad04e
Add cmd line opt to disable settings reset popup
2016-06-14 16:34:46 -07:00
Atlante45
5560ba9a4c
Quit application when SteamVR requests it
2016-06-14 16:29:50 -07:00
Atlante45
96258a795a
Initial Steamworks integration
2016-06-14 16:29:50 -07:00
Brad Hefta-Gaub
1c391e626f
Merge pull request #8054 from ctrlaltdavid/20957
...
fix model export continued
2016-06-14 10:57:25 -07:00
Bradley Austin Davis
175dbb8924
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-14 09:48:56 -07:00
Brad Hefta-Gaub
7da29daf9d
Merge pull request #8036 from ctrlaltdavid/20955
...
Fix image2d overlay color property
2016-06-13 19:21:59 -07:00
Howard Stearns
d05987de6d
Merge pull request #8042 from jherico/lasers
...
First pass prototype of laser rendering in OpenVR plugin
2016-06-13 18:06:15 -07:00
Howard Stearns
213479c530
Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements
...
HMD UI re-centering while driving improvements.
2016-06-13 14:28:50 -07:00
Chris Collins
b14f9cd312
Merge pull request #8041 from sethalves/fix-avatar-entity-locking
...
Fix avatar entity locking
2016-06-13 13:10:32 -07:00
Brad Davis
9640727f51
Hand laser rendering support in HMD plugins.
2016-06-13 13:04:11 -07:00
Brad Davis
0ddee876c3
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-13 13:03:46 -07:00
David Rowe
5553c9f87f
Code review
2016-06-14 07:46:41 +12:00
Anthony J. Thibault
21e67fc4d8
Another unused variable warning
2016-06-13 12:03:42 -07:00
Anthony J. Thibault
1ca1f98034
Fix unused variable warning
2016-06-13 12:01:42 -07:00
Anthony J. Thibault
ab4bef7d55
Fixes based on PR feedback
...
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
2016-06-13 11:19:47 -07:00
Anthony J. Thibault
ccf85c1f7c
Merge branch 'vive-ui' into bug-fix/hmd-ui-center-improvements
2016-06-13 09:48:58 -07:00
David Rowe
098432152d
Merge branch 'master' into 20957
2016-06-13 16:16:12 +12:00
David Rowe
f7578f084f
Fix buttons on warning message box when can't export a file
2016-06-13 15:21:59 +12:00
David Rowe
546699da03
When choosing a directory default selection to default directory
2016-06-13 15:06:10 +12:00
David Rowe
d74f1c8b5d
Fix default directory for Settings directory preference fields
2016-06-13 14:51:14 +12:00
Brad Hefta-Gaub
92909af52c
Merge pull request #8044 from ctrlaltdavid/20957
...
fix model export
2016-06-12 19:43:51 -07:00
David Rowe
58f89c88a2
Remember last directory used for Window.browse() and Window.save()
...
Use last directory if not specified in method call. Default to desktop.
2016-06-11 16:45:17 +12:00
Seth Alves
4c45d081cd
merge from upstream
2016-06-10 19:57:46 -07:00
Anthony J. Thibault
f6ed5a1dae
Bugfixes based on feedback
...
* When the overlay is hidden because your head is too close to the sphere,
instead of coming back immediately, it waits until the avatar's velocity is near zero
for a period of time.
* Hooked up jump and fly to MyAvatar::hasDriveInput()
* Added an internal state machine to OverlayConductor to manage hiding/showing transitions.
* The overlay menu state is now tied directly to the overlay, so it will change state as the
overlay is dynamically hidden/shown from code.
* Removed slot going directly from MenuOption::Overlays directly to OverlayConductor::setEnable().
2016-06-10 18:33:40 -07:00
Chris Collins
006eb8fe64
Merge pull request #8031 from birarda/api-recheck-on-fail
...
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
2016-06-10 15:26:42 -07:00
Brad Davis
472a3540d7
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
Stephen Birarda
3c4f336e72
re-instate NodeList reset on limit of check ins reached
2016-06-10 09:11:25 -07:00
Brad Hefta-Gaub
426d67f5bf
Merge pull request #8038 from jherico/pure_virtual
...
Attempt to get better logging from pure virtual call crashes
2016-06-10 08:25:10 -07:00
Anthony J. Thibault
685710d0ec
OverlayConductor improvments
...
* the HUD will fade/in when driving, even in desktop mode.
* the HUD no longer pops when you lean outside of the UI sphere,
instead it should smoothly fade out and fade back in.
* the overlay toggle button should override fading while driving, as expected.
* removed any notion of SITTING, STANDING or FLAT mode from overlay.
2016-06-09 18:09:04 -07:00
Stephen Birarda
e4ebafa0d8
add a menu option to force the wrong DS connect version
2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4
fix connection denial message, put version back
2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122
remove check in version downgrading from NodeList
2016-06-09 15:53:19 -07:00
Seth Alves
441b5a20d8
merge from upstream
2016-06-09 13:23:41 -07:00
Brad Davis
cd7c6be590
Fix formatting
2016-06-09 12:25:21 -07:00
Brad Hefta-Gaub
3c5af56421
Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property
...
Added MyAvatar.hmdLeanRecenterEnabled property
2016-06-09 12:17:51 -07:00
Anthony J. Thibault
6e3057479f
fixes for warnings
...
Also overlays menu option should work better in conjunction with ui-center/fading
2016-06-09 11:27:02 -07:00
Brad Davis
eee1ba0906
trying to get buildability
2016-06-09 10:19:38 -07:00
Seth Alves
203ea5ddc7
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-09 09:53:33 -07:00
