Atlante45
38f74c1843
Remove the last of the glow level
2016-05-14 14:49:31 -07:00
Brad Davis
ba357721bf
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
...
Fix for vive controllers sometimes not working
2016-05-11 14:32:33 -07:00
Anthony J. Thibault
c91455a291
Added mapping from Vive LSTouch and RSTouch to Standard.
2016-05-11 10:36:55 -07:00
Anthony J. Thibault
09a4e0eaa8
Fix for vive controllers sometimes not working
...
* Fixed bug with input devices that where added, removed then re-added.
The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
2016-05-10 19:32:08 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Anthony J. Thibault
0f1ff87f78
Updated default idle and turn animations.
...
* idle is less masculine and works better on prescilla & art3mis avatars.
* idle to walk transition is updated to work with this new idle.
* turn in place animations are improved.
* fly animation is more symmetric.
2016-05-09 18:43:30 -07:00
howard-stearns
11ae685f04
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-09 11:50:07 -07:00
Seth Alves
073d845bb5
show with debug icons when someone else is the simulation owner
2016-05-05 18:33:01 -07:00
howard-stearns
d3c6662198
Take the deadband down a notch, following feedback from P.
2016-05-03 16:35:20 -07:00
Howard Stearns
773770a7fc
All but origin-correction.
2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
cddcac60c1
Merge pull request #7768 from ctrlaltdavid/20891
...
Add Interface "Home" bookmark function
2016-05-02 10:14:57 -07:00
David Rowe
6b8109f164
Fix avatar browser top border height and remove separate "close" button
2016-04-29 12:42:10 +12:00
David Rowe
e5ee98ee60
Fix up filenames in headers
2016-04-28 11:19:30 +12:00
David Rowe
16874baf5f
Use UI Toolkit border styles for various dialogs
...
File > Help...
File > About Interface
Settings > Avatar Settings > Browse
Go To button (directory.js)
Examples button (examples.js)
2016-04-28 11:14:39 +12:00
David Rowe
f74be226c8
Add "home" button to address bar
2016-04-27 10:28:05 +12:00
Brad Hefta-Gaub
82f905dc84
fix qml issue
2016-04-26 13:29:22 -07:00
Brad Hefta-Gaub
e7d26a8a63
CR feedback magic numbers
2016-04-26 11:45:48 -07:00
Brad Hefta-Gaub
0ae6e9f241
remove debug messages
2016-04-26 11:36:21 -07:00
Brad Hefta-Gaub
716d9e554c
removed a bunch of dead code
2016-04-26 09:25:28 -07:00
Brad Hefta-Gaub
4ab7b660d4
fix a bunch of bugs in qml window placement
2016-04-25 20:19:54 -07:00
Stephen Birarda
09a068e472
add back the avatar animation file new path
2016-04-22 13:53:39 -07:00
Stephen Birarda
132d9c3486
replace the default avatar with the being of light
2016-04-22 13:48:30 -07:00
Brad Hefta-Gaub
f4e4f217e8
Merge pull request #7642 from ctrlaltdavid/20872
...
Further restyling of edit.js
2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
79a1e6264e
Merge pull request #7714 from hyperlogic/tony/default-anims-are-local
...
Avatar animations are now stored locally
2016-04-22 13:44:30 -07:00
David Rowe
7b9e6b52fb
Merge branch 'master' into 20872
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae
Decouple ui and shared libraries
2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b
Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD
2016-04-22 12:29:22 +12:00
David Rowe
6c5335cfa7
Replace button with icon and text
2016-04-21 15:17:06 +12:00
David Rowe
9c9bca546c
Add button that opens scripts directory window
2016-04-21 11:52:03 +12:00
Anthony J. Thibault
506033a5d8
Remove old avatar-animation.json
2016-04-19 16:14:26 -07:00
Anthony J. Thibault
8e5785cdf8
Avatar animations are now stored locally
...
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
2016-04-19 16:11:14 -07:00
David Rowe
54b032f612
Merge branch 'master' into 20872
2016-04-20 08:51:53 +12:00
David Rowe
47b4c36546
Merge branch 'master' into 20872
2016-04-19 12:56:55 +12:00
Brad Hefta-Gaub
f5cddc9962
fix the bug that Omega found
2016-04-18 17:26:12 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
Brad Hefta-Gaub
b62f1a135d
fix qml to work with rect instead of vec4
2016-04-16 17:29:03 -07:00
Brad Hefta-Gaub
8f3d48190a
switch to QRect instead of vec4
2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807
code review feedback
2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-16 15:19:35 -07:00
David Rowe
8f6cfb72ea
Fix QML warnings at shutdown
2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
d5a46d3390
handle repositioning of qml windows
2016-04-15 20:01:14 -07:00
Brad Hefta-Gaub
04df84974c
handle repositioning of qml windows
2016-04-15 19:50:12 -07:00
Howard Stearns
e4f8a67e60
Merge pull request #7649 from hyperlogic/tony/simplify-away-mode
...
away.js: fix for permanent disabling avatar IK
2016-04-15 13:35:14 -07:00
David Rowe
19fd8cda14
Merge branch 'master' into 20872
2016-04-15 17:36:42 +12:00
David Rowe
bda2f455e5
Add buttons to entities list that toggle locked and visible
2016-04-15 16:26:34 +12:00
David Rowe
9e2c844dc0
Updated the HiFi glyphs font file
...
Used the new "model" icon in entity properties tab.
2016-04-13 16:48:13 +12:00
David Rowe
43f843f731
Retrofit updated margins and spacing to QML dialogs
2016-04-13 16:39:52 +12:00
David Rowe
b33d28852b
Merge branch 'master' into 20872
2016-04-13 13:11:26 +12:00
Brad Davis
1a02220886
Fixing wobble
2016-04-12 17:50:59 -07:00
Anthony J. Thibault
87cba810a7
remove away states from avatar-animation.json
...
away.js: prefetch the kneel animation, so it is available when we need it.
2016-04-12 15:37:31 -07:00
