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

873 commits

Author SHA1 Message Date
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