howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
howard-stearns
d3735322a5
Whitespace.
2016-06-22 13:03:13 -07:00
Ryan Huffman
2621add8e3
Fix nearby_avatars not tracking
2016-06-22 09:17:28 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Davis
c928de6051
Merge pull request #8099 from howard-stearns/turn-hud-reset-behavior-on-by-default
...
turn hud reset behavior on by default
2016-06-21 13:33:23 -07:00
Brad Davis
f475dd1d85
Merge pull request #8100 from howard-stearns/minimize-trigger-distance-to-hud
...
minimize trigger distance to hud
2016-06-21 13:33:16 -07:00
Brad Hefta-Gaub
160a5de271
CR feedback
2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b
Fix more osx warning
2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048
Fix osx warning
2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3
Fix osx warning
2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6
Add changed display mode tracking
2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd
Cleanup nearby avatar tracking
2016-06-20 16:09:17 -07:00
Ryan Huffman
3aac0cc4fb
Update fps useractivity with more general stats
2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a
Add more values to launch UserActivity
2016-06-20 16:02:14 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
Howard Stearns
81300ec127
turn hud reset behavior on by default
2016-06-18 14:35:37 -07:00
Howard Stearns
6196c657f8
Minimize triggering distance to HUD.
2016-06-18 14:17:47 -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
Ryan Huffman
c7955900ab
Add new user activity events
2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7
Add UserActivityLogger scripting interface
2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0
Move session id storage to AccountManager
2016-06-16 09:19:42 -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
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
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
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
