Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 05:47:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 25 branches 0 tags 1.1 GiB
Commit graph

1153 commits

Author SHA1 Message Date
Chris Collins
64a07440cc Merge pull request #7180 from jherico/qml 
Several QML fixes
 2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186 Merge pull request #7176 from zzmp/menu/graphics 
Update graphics menus
 2016-02-24 08:18:58 -08:00
Brad Davis
fa23e2023e Fix bad tool window placement 2016-02-23 21:05:57 -08:00
Clément Brisset
8e8e23452f Merge pull request #7156 from ZappoMan/depthReticleWork 
Depth reticle work
 2016-02-23 17:54:35 -08:00
David Rowe
a816d835d3 Finesse modal message box dialog layout 2016-02-24 13:59:43 +13:00
Zach Pomerantz
ea8edb3744 Remove antialiasing from menus, default to on 2016-02-23 16:24:44 -08:00
Chris Collins
94d018be3e Merge pull request #7172 from zzmp/fix/stats 
Consolidate stats for opaque/transparent/other
 2016-02-23 16:23:11 -08:00
David Rowe
7ee1edac3a Merge branch '20805' into 20809 2016-02-24 13:08:28 +13:00
David Rowe
beef3f59eb Fix QML warning 2016-02-24 12:59:21 +13:00
David Rowe
76ec5e4600 Merge branch 'master' into 20805 2016-02-24 12:38:44 +13:00
David Rowe
ad4d697f38 Use names for HiFi glyph characters 2016-02-24 12:37:23 +13:00
David Rowe
bac703b29e Adjust height of Running Scripts now that fonts are consistently sized 2016-02-24 12:36:46 +13:00
David Rowe
128583660b Specify font sizes in pixels instead of points 
Makes the dialog layout and look consistent across different devices.
 2016-02-24 12:10:19 +13:00
David Rowe
9dd1bfad2d Fix tree view branch indicator colors 
Using interim HiFi glyphs until branch triangles are added to the font.
 2016-02-24 10:54:36 +13:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
Brad Hefta-Gaub
71262c3e64 cleaner QML rejection of mouse messages 2016-02-23 11:14:16 -08:00
Brad Hefta-Gaub
8117d51324 Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-23 10:21:10 -08:00
Brad Hefta-Gaub
2db25690f1 detect when mouse is over QML overlays or 2D JS Overlays 2016-02-23 10:14:44 -08:00
David Rowe
fdb7a9cf75 Merge branch '20805' into 20809 2016-02-23 20:29:18 +13:00
David Rowe
e30135a89d Increase height of dialog to avoid scrollbars 2016-02-23 20:05:45 +13:00
David Rowe
67b6cafc92 Use placeholder text for Filter field instead of separate label 
Also fixes color of separate label if that is reinstated at some time.
 2016-02-23 20:05:16 +13:00
David Rowe
9583b801f6 Increase size of resize handle 2016-02-23 19:57:13 +13:00
David Rowe
6bf377aac8 Move FontAwesome.qml to be with other font files 2016-02-23 18:16:32 +13:00
David Rowe
0e3cbd2930 Tidying 2016-02-23 18:05:49 +13:00
David Rowe
b09a20187a Reverse order buttons appear in to make more consistent with Windows 2016-02-23 17:57:21 +13:00
David Rowe
aa32c1f1af Restyle modal message dialog content 2016-02-23 17:54:02 +13:00
David Rowe
86bb1b1ed8 Make copy of TextEdit control for restyling 2016-02-23 17:44:11 +13:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
David Rowe
84e352a1de Move icon to be in title 2016-02-23 14:54:49 +13:00
David Rowe
33cfe8f21f Style modal dialog icon and message 2016-02-23 13:31:08 +13:00
David Rowe
f1921b4e38 Style modal dialog title 2016-02-23 13:14:38 +13:00
David Rowe
e86b36b00f Don't whitewash screen when modal dialog is displayed 
Focus shadow is used instead.
 2016-02-23 13:12:29 +13:00
David Rowe
f7654dce05 Style modal dialog background and border 2016-02-23 13:10:02 +13:00
David Rowe
d986a45497 Merge branch '20805' into 20809 2016-02-23 09:59:39 +13:00
David Rowe
942406e5d5 Improve focus shadow 2016-02-23 09:58:37 +13:00
David Rowe
42734a0202 Tidy desktop QML dialogs 2016-02-22 21:16:00 +13:00
David Rowe
72fb2ff102 Make copies of modal window files 2016-02-22 17:05:57 +13:00
David Rowe
db6c76bf67 Merge branch 'master' into 20805 2016-02-22 13:15:40 +13:00
David Rowe
bfedd24ad7 Fixes after reviewing against latest UI Toolkit doc 2016-02-21 16:43:41 +13:00
David Rowe
558c8872b1 Rework scrollbar to make layout more robust 2016-02-21 14:02:51 +13:00
David Rowe
b2c74447fb Fix OSX scrollbars in scripts lists starting too low 2016-02-21 12:44:29 +13:00
Brad Hefta-Gaub
9066fb0622 Merge pull request #7145 from howard-stearns/lod-pid-removal 
Lod pid removal
 2016-02-20 10:29:42 -08:00
David Rowe
91e4fb478d Don't display dialog focus or content shadows on OSX 
Alpha gradients display as fuchsia on OSX.
 2016-02-20 13:12:51 +13:00
Brad Hefta-Gaub
342391cb2f Merge pull request #7143 from imgntn/webengine-new-windows 
Add support for pop-up windows to Qt WebEngineView
 2016-02-19 14:31:16 -08:00
Brad Hefta-Gaub
edb241807a Merge pull request #7137 from imgntn/webengine-fun 
Enable HTML5 userMedia APIs in QTWebengine view
 2016-02-19 14:27:27 -08:00
James B. Pollack
56f8282607 dont need this code here 2016-02-19 13:54:31 -08:00
James B. Pollack
7ec09c49f3 feature request is in another pull 2016-02-19 13:53:22 -08:00
James B. Pollack
afb6f1fe84 no clipboard 2016-02-19 13:50:30 -08:00
James B. Pollack
66e8f070e4 popup windows 2016-02-19 13:48:54 -08:00
Howard Stearns
30b4eace95 Remove LOD PID-related preferences and the related toggling of preferences. 2016-02-19 11:52:07 -08:00
Brad Davis
6f364de062 Add a QML document referencing the QML multimedia types to force inclusion in the build 2016-02-18 18:39:25 -08:00
James B. Pollack
d73728ae78 add to browser 2016-02-18 16:58:34 -08:00
James B. Pollack
4b29921e63 media! 2016-02-18 16:41:29 -08:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
b68837277c Fix default focus 2016-02-18 22:12:43 +13:00
David Rowe
81169c59c8 Fix runtime warnings 2016-02-18 19:52:20 +13:00
David Rowe
4df77cff31 Add scrollbars to running scripts and available scripts tables 2016-02-18 18:10:58 +13:00
David Rowe
d32f743f52 Style running scripts and available scripts tables 2016-02-18 16:35:51 +13:00
David Rowe
b2314d33ba Style and lay out text fields 2016-02-17 20:44:09 +13:00
David Rowe
2a25509f7c Further font fixes 2016-02-17 20:38:01 +13:00
David Rowe
f568b1c67f Fix display of Raleway Bold 2016-02-17 16:19:00 +13:00
David Rowe
61d359a9b5 Style Button controls 2016-02-17 16:12:11 +13:00
David Rowe
1164e3e303 Set up window pane's content width so that can right-align 2016-02-17 15:35:35 +13:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
David Rowe
30498760b0 Set up and use font size values 2016-02-16 21:06:06 +13:00
David Rowe
386a247f78 Put Running Scripts content into sections 2016-02-16 17:48:21 +13:00
David Rowe
3c1561cc06 Revise scrollbar handling to make better for content 2016-02-16 16:03:23 +13:00
David Rowe
d46f85c5dd Allow noninteger font sizes 2016-02-16 14:50:28 +13:00
David Rowe
535b183f76 Fix focus shadow vertical position 2016-02-16 13:44:36 +13:00
David Rowe
0442fcf89c Add shadow at bottom of content 2016-02-16 12:20:01 +13:00
David Rowe
615b2e6052 Fix up some colors 2016-02-16 11:01:53 +13:00
David Rowe
6a22078d2c Add focus shadow 2016-02-16 10:47:45 +13:00
howard-stearns
4150d318d3 "Leave it on by default" (and change name of route variable to SnapTurn). 2016-02-15 13:39:53 -08:00
David Rowe
4d74bb04b0 Style scrollbar 2016-02-16 09:48:09 +13:00
howard-stearns
7057d5c40c Snap Turn avatar preference. (Still tied to Developer menu item.) 2016-02-15 12:38:40 -08:00
David Rowe
9a536b3b33 Specify a minimum Running Scripts window size 2016-02-15 18:02:59 +13:00
David Rowe
a5da678d6e Make Running Scripts dialog content scrollable when needed 2016-02-15 18:02:20 +13:00
David Rowe
31930e879a Style content background, size frame, and position frame elements 2016-02-14 21:01:23 +13:00
David Rowe
9479da616f Restyle dialog resizing 2016-02-13 18:24:23 +13:00
David Rowe
946807431e Fix frame icons not hovering 2016-02-13 17:31:18 +13:00
David Rowe
42a44e0f67 First pass at restyling dialog frame 
"Pin" button is implemented but disabled (as it was before).
 2016-02-13 15:15:01 +13:00
David Rowe
d6772545d5 Text font sizes are specified in points 2016-02-13 15:10:19 +13:00
David Rowe
f29b75b517 Add fonts 2016-02-12 13:17:27 +13:00
David Rowe
3d8df56baa Copy bare minimum of files as start of restyling Running Scripts dialog 
And add license headers to files.
 2016-02-12 10:13:06 +13:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
Zach Pomerantz
66e1d9668c Add ComboBox preference 2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e Move graphics settings to dedicated dialog 2016-02-11 10:00:44 -08:00
Brad Hefta-Gaub
5120076add Merge pull request #7060 from jherico/qml 
Small QML fixes
 2016-02-10 11:39:45 -08:00
Brad Davis
4d1c24abb7 Fix OverlayWindow loading issues 2016-02-10 10:02:20 -08:00
howard-stearns
e2ac48fac0 Fix ToolWindow's initial position (e.g., as used by edit.js). 2016-02-09 14:49:50 -08:00
Brad Davis
427644cb77 Add better keyboard navigation to file dialog 2016-02-08 16:12:24 -08:00
Brad Davis
e376b781c1 Keyboard navigation in running scripts list 2016-02-08 16:12:23 -08:00
Philip Rosedale
63afa8c1ed Merge pull request #7040 from hyperlogic/tony/landing-animation 
MyAvatar: added standing and run landing animations
 2016-02-08 11:38:12 -08:00
Brad Hefta-Gaub
7939f1381c Merge pull request #7036 from jherico/qml 
Fix native text rendering by forcing positions to integer values
 2016-02-08 09:45:57 -08:00
Anthony J. Thibault
d24a024726 MyAvatar: added standing and run landing animations 2016-02-05 17:53:50 -08:00
Andrew Meadows
09bdccb18c Merge pull request #7032 from hyperlogic/tony/standing-jump 
MyAvatar: Standing Takeoff and In-Air Animations
 2016-02-05 13:45:52 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
8f85abfec8 Support 'naked' selection globs in file dialog 2016-02-03 14:51:07 -08:00
Bradley Austin Davis
320c4d27b5 Force Qt (rather than OS) rendering in a number of places 2016-02-03 14:51:05 -08:00
Andrew Meadows
861082964e Merge pull request #7017 from hyperlogic/tony/fly 
MyAvatar: Improved Jump / InAir / Fly behavior
 2016-02-03 12:22:30 -08:00
Bradley Austin Davis
bc7fda0ae9 Set desirable global settings for QML web views 2016-02-02 15:19:47 -08:00
Bradley Austin Davis
cede14fdc6 Don't cut off title of windows without close icons 2016-02-02 14:32:04 -08:00
Anthony J. Thibault
656608e2ff Fixes for away.js 2016-02-02 12:08:52 -08:00
Anthony J. Thibault
2936811484 Added takeoff animation, WIP 
Character controller still has some jump/in-air bugs.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd Added inAir animations 2016-02-02 11:23:46 -08:00
Andrew Meadows
e394f64540 Merge pull request #6991 from seefo/master 
Added camera sensitivity dialog preferences
 2016-02-02 08:22:45 -08:00
Bradley Austin Davis
4860c7d4f1 Give title to tool window 2016-02-01 18:28:23 -08:00
Bradley Austin Davis
c71a20b2f0 Move a QML window to the center of the desktop if it's completely off 2016-02-01 15:34:13 -08:00
Bradley Austin Davis
4393a754e2 File dialog polish 2016-02-01 15:34:10 -08:00
Bradley Austin Davis
9da0181b72 Don't try to be clever with coloring table rows 2016-02-01 15:34:07 -08:00
Bradley Austin Davis
093ccb483d FontAwseome button polish 2016-02-01 15:34:04 -08:00
Bradley Austin Davis
4b9e5746cd Removing some runtime warnings about null values 2016-02-01 15:34:01 -08:00
Bradley Austin Davis
7938270802 Fix modal frame decoration 2016-02-01 15:33:58 -08:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
Seefo
ffa6687af3 Added setting dialogs for camera pitch and yaw 2016-01-29 19:34:57 -05:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
Andrew Meadows
5bae01485e Merge pull request #6975 from hyperlogic/tony/update-standard-anims 
Update animations to use standard joint orientations
 2016-01-29 08:58:06 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
Brad Davis
c80193635b Update input dialog to support choice selection 2016-01-28 21:19:21 -08:00
Brad Davis
35211b7475 Add titles to modal dialogs, move z-order debug display to bottom of window 2016-01-28 21:18:14 -08:00
Brad Davis
afd3ddf534 Cleaning up message box 2016-01-28 21:17:05 -08:00
Brad Davis
ab56765ebd Add titles to windows 2016-01-28 17:52:22 -08:00
Brad Davis
8c19b95ea2 Fix oversized text, invalid color handling 2016-01-28 16:36:28 -08:00
Brad Davis
72b264dcde Ensure toolbar z-order is always below windows 2016-01-28 16:03:27 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
James B. Pollack
78d06ed32a Merge pull request #6952 from howard-stearns/avatar-preferences-chooser 
avatar preferences chooser modal web
 2016-01-28 16:01:53 -08:00
Brad Davis
db7e4eee8f Make Ctrl-O and 'Running Scripts->load file' follow the same code path 2016-01-28 15:52:11 -08:00
Brad Davis
1324525ecc Make file dialog compatible with QFileDialog::getOpenFile 2016-01-28 15:50:57 -08:00
Brad Davis
af1180aadb Fix combobox in modal windows 2016-01-28 15:47:42 -08:00
Anthony J. Thibault
d743ea2c9b Changed urls from s3-us-west-1 to hifi-content.s3 2016-01-28 14:20:10 -08:00
Anthony J. Thibault
8710029604 Changed urls to http and updated hand poses. 2016-01-28 14:12:52 -08:00
Brad Davis
c41500f9d2 Running scripts can now show script URL 2016-01-28 12:21:44 -08:00
Brad Davis
04e6a5360a Renaming preference dialog variable 2016-01-28 10:29:21 -08:00
Brad Davis
18d6a09dc9 Better preferences dialog initial state 2016-01-28 09:20:31 -08:00
Brad Davis
d9651c6d4b Allow user browser to work with marketplace 2016-01-28 09:20:29 -08:00
Anthony J. Thibault
4e4627d039 avatar-animation.json: Updated standard animations 2016-01-27 17:08:49 -08:00
Andrew Meadows
7b5c221ceb Merge pull request #6956 from hyperlogic/tony/velocity-fix 
MyAvatar: copy body velocity + hmd follow velocity onto avatar
 2016-01-27 14:59:46 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
Anthony J. Thibault
c771c925c8 MyAvatar: copy body velocity + hmd follow velocity onto avatar 
This was inadvertently removed in a previous PR.

https://github.com/highfidelity/hifi/pull/6895

Also, renamed Velocity stat to Speed.
 2016-01-27 11:20:32 -08:00
Brad Davis
f53aaa1d64 Removing old attachment dialog, updating menu code 2016-01-26 21:55:42 -08:00
Brad Davis
2956557c5f Adding overlay compatible combo-box 2016-01-26 21:55:41 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Howard Stearns
91b0f69312 When the avatar marketplace is chosen from avatar preferences, let it be moveable so that the user can move it aside to see their avatar. 2016-01-26 21:02:16 -08:00
Brad Davis
0a6be80578 Added some disabled modal focus protection code 2016-01-26 18:50:55 -08:00
Brad Davis
fbee221966 Fix tool window breaking when visible while edit.js reloads 2016-01-26 18:15:41 -08:00
Brad Davis
9a8d56da77 Center new windows without a defined position 2016-01-26 17:25:36 -08:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Brad Davis
8dc066fc00 Fix the recursive launching of load script from URL 2016-01-26 16:49:23 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
Brad Davis
1c97e15757 Fix overlay message dialog 2016-01-25 13:30:05 -08:00
Brad Davis
7eac917de5 Address bar polish and visibility handler fix 2016-01-24 15:23:37 -08:00
Brad Davis
79e6aaf17f Make tool window closable 2016-01-24 14:25:23 -08:00
Brad Davis
8ed5ea8605 Login dialog polish 2016-01-24 13:32:55 -08:00
Brad Hefta-Gaub
ab133f37a0 Merge pull request #6920 from jherico/preferences4 
Break up preferences into multiple dialogs
 2016-01-24 13:24:25 -08:00
Brad Davis
6e3796963c Window swallows more events, preventing them from reaching the applicaiton. 2016-01-24 12:25:03 -08:00
Brad Davis
19f259b273 Fix url auth issues again 2016-01-24 12:07:39 -08:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Davis
8e57f06de2 Add browser action shortcut to our custom desktop 2016-01-23 22:06:59 -08:00
Brad Davis
12cc873716 Hide focus debugger unless it's explicitly turned on 2016-01-23 22:06:58 -08:00
Brad Davis
5fc43e7018 Render scalable favicons at a fixed size 2016-01-23 22:06:14 -08:00
Brad Davis
e52e35df8c Better initial window positioning 2016-01-23 22:06:13 -08:00
Brad Davis
159794cafd Stop address bar stealing keyboard focus 2016-01-23 22:05:01 -08:00
Brad Davis
d70faf5985 Fix running scripts filter initial state 2016-01-23 22:03:24 -08:00
Brad Davis
5fde166a38 Fix menu Z-order 2016-01-23 22:03:24 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Anthony J. Thibault
7af20e90c8 Hooked up fly animation to json and Rig 2016-01-22 13:47:09 -08:00
Howard Stearns
9cec0e655b Remove obsolete reference to text chat within "about" text. 2016-01-22 10:45:04 -08:00
Brad Davis
f343598d91 Focus hack for menu fix 2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165 Frame construction in onCompleted was messing up the browser keyboard focus 2016-01-22 00:55:31 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Brad Hefta-Gaub
4ea5c11b73 Merge pull request #6862 from ctrlaltdavid/20783 
Make running scripts list scrollable with scroll bar
 2016-01-19 23:29:37 -08:00
James B. Pollack
347293a6a4 Merge pull request #6858 from ctrlaltdavid/20780 
Make filter in Running Scripts window be case-insensitive
 2016-01-19 10:51:42 -08:00
David Rowe
9393735478 Make running scripts list scrollable with scroll bar 2016-01-19 20:25:16 +13:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow 
Add RenderShadowTask
 2016-01-18 15:45:51 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
cf8d2c5182 Integrate file open dialog into running scripts dialog 2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
David Rowe
0b71f1e1b8 Make filter in Running Scripts window be case-insensitive 2016-01-16 16:29:01 +13:00
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
Zach Pomerantz
2938829167 Add shadow items to stats 2016-01-13 17:49:37 -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
Brad Davis
4c26627622 Add navigation actions and wire them up in the standard controller 2015-12-30 17:14:40 -08:00
Brad Davis
a834f28eca Add a tag to the top level QML dialog so loaded content can manipulate it easily 2015-12-30 17:14:03 -08:00
Brad Davis
f4bd2afc8e Make script launched windows invisible at creation time 2015-12-30 11:38:34 -08:00
Brad Davis
d6f5296c3b Working on event bridge and scripting interfaces 2015-12-30 09:14:50 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
Anthony J. Thibault
dcde640acd Stub Perception Neuron input plugin 2015-12-21 10:06:36 -08:00
Brad Davis
ae6cf131f5 Fixing crash bug 2015-12-18 17:19:06 -08:00