Philip Rosedale
0ec754cf5f
Merge pull request #6839 from hyperlogic/tony/squeeze-hands-part-deux
...
Updated animations for left hand grasp
2016-01-14 16:57:46 -08:00
Brad Hefta-Gaub
a70adc8a57
Merge pull request #6823 from jherico/tool_window
...
Tool window in QML
2016-01-14 16:56:27 -08:00
Brad Davis
98df0d8fcc
Merge pull request #6836 from ZappoMan/menuGroups
...
wire up audio show level meter menu
2016-01-14 19:27:47 -05:00
Anthony J. Thibault
90516d95f2
Updated animations for left hand grasp
2016-01-14 16:22:58 -08:00
Brad Davis
e76e13c05c
Removing close button on tool window, fixing dragging
2016-01-14 14:20:31 -08:00
Brad Hefta-Gaub
2177765b09
wire up audio show level meter menu
2016-01-14 13:12:16 -08:00
Anthony J. Thibault
51d678670d
Updated grab animations for right hand
2016-01-14 12:57:30 -08:00
Anthony J. Thibault
c267d672d2
Updated hand grab animations
...
Left hand is old squeeze hands poses
Right hand is new hydra grasp poses
2016-01-14 08:57:27 -08:00
Anthony J. Thibault
75b3523c33
Simplify grab animation logic
...
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js
Deleted old hydra/squeezeHands.js to avoid confusion.
Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
Brad Davis
b6272b7824
Migrate tool window to overlay/QML
2016-01-13 15:40:37 -08:00
Brad Hefta-Gaub
cd167e43fb
Merge pull request #6812 from jherico/running_scripts
...
Running scripts in QML
2016-01-12 13:40:47 -08:00
Brad Davis
e7bfcba44f
Fix 'load' button
2016-01-12 13:17:06 -08:00
Brad Davis
2ed54d8ea7
Cleanup running scripts
2016-01-12 13:11:03 -08:00
Howard Stearns
d1a72e8d63
Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation
...
Move hand animation control into grab script
2016-01-12 13:02:59 -08:00
Brad Davis
dcc6739bce
Final functionality for running scripts
2016-01-12 12:40:46 -08:00
Brad Davis
a9eb5b8229
Load script from file
2016-01-12 12:40:45 -08:00
Brad Davis
4f975de6a6
Working on crash fixes, file open dialog
2016-01-12 12:40:43 -08:00
Brad Davis
21534cbde0
Layout for running scripts
2016-01-12 12:40:42 -08:00
Anthony J. Thibault
fee6bda721
Updated hand animation references.
2016-01-12 12:18:26 -08:00
Anthony J. Thibault
b44ae3a197
avatar-animation.json: Updated right hand grasp animations
2016-01-11 16:55:45 -08:00
Brad Davis
d28f80aa07
Moving running scripts functionality to scripting library
2016-01-11 12:44:03 -08:00
Anthony J. Thibault
8f78a0624c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-11 10:16:51 -08:00
David Rowe
9068d55998
Fix display of File > About Interface window
2016-01-11 15:58:00 +13:00
Brad Davis
d74686474a
Ensure VR menus never render off the overlay
2016-01-10 11:39:47 -08:00
Anthony J. Thibault
8e915733f0
added place holder right hand open/searching animation
2016-01-08 17:15:18 -08:00
Anthony J. Thibault
cac19b8579
grab animation work
...
Hand animations now have 5 states:
* idle
* open
* grasp
* point
* farGrasp
The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.
Also, removed hand trigger AnimVar setting from C++ Rig class.
2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-07 16:58:10 -08:00
Brad Davis
35e17b7604
movable audio bar
2016-01-07 15:43:51 -08:00
Brad Davis
144af19ebd
Stop looping on URL fixing
2016-01-07 10:52:28 -08:00
Anthony J. Thibault
dfc3f02db3
avatar-animation.json: Removed point outro state.
...
Also replaced right hand point with force grab animation.
2016-01-06 18:15:32 -08:00
Brad Davis
44b9bc7115
Force active focus on the address bar line while address bar is visible
2016-01-06 11:10:05 -08:00
Brad Davis
1b82200ecb
Address some z-ordering issues in overlay windows
2016-01-06 10:58:56 -08:00
Anthony J. Thibault
3e6ff0eb68
Moved hand animation control into grab script.
2016-01-05 19:56:56 -08:00
Andrew Meadows
62688d5c07
Merge pull request #6768 from jherico/vr_keys
...
Tweaks for supporting the new QML UI
2016-01-05 10:31:57 -08:00
Andrew Meadows
43d8c14c16
Merge pull request #6767 from howard-stearns/pid-render-limits
...
render limits fixes
2016-01-05 10:17:04 -08:00
Brad Davis
900a0f7f08
Trigger selection is too twitchy
2016-01-05 09:16:44 -08:00
Brad Davis
8485c89a0e
More work on exposing tools to QML overlay windows
2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084
Working on focus problems
2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1
Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop
2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b
QML dialogs should not consume key events when disabled
2016-01-04 20:51:49 -08:00
Brad Davis
125d103e29
Merge pull request #6762 from ZappoMan/hideMirrorAndAudioInHMD
...
hide the rear view mirror and the audio in the HMD
2016-01-04 18:03:33 -05:00
Andrew Meadows
164c649a33
Merge pull request #6681 from howard-stearns/pid-render-limits
...
Pid render limits
2016-01-04 14:47:31 -08:00
howard-stearns
333eadd551
Don't show render count / distance when using acuity.
2016-01-04 14:46:57 -08:00
Brad Hefta-Gaub
f719f4a1cc
hide the rear view mirror and the audio in the HMD
2016-01-04 13:31:01 -08:00
Howard Stearns
9c8a04ce1e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2016-01-04 09:26:14 -08:00
Brad Davis
297e58fbc6
Cleanup
2016-01-03 20:29:31 -08:00
Brad Davis
435ab8c4e8
Fix possible log spam issue
2016-01-03 20:22:55 -08:00
Brad Davis
bfa9213a10
Allow keyboard navigation of 'vr menu'
2016-01-03 20:22:39 -08:00
Brad Davis
67e32cc1f0
Consolidating URL handling, exposing to all QML objects
2015-12-31 14:14:48 -08:00
Brad Davis
000130617e
Allow input devices to break up their mappings into multiple files
2015-12-30 22:28:10 -08:00
