Commit graph

15914 commits

Author SHA1 Message Date
David Rowe
09029e4edd Change name of dialog to match menu item 2016-02-25 20:37:54 +13:00
David Rowe
f04654fb56 Style and swap order of save and cancel buttons 2016-02-25 20:35:27 +13:00
David Rowe
10efbd996f Update General Settings dialog to use new window frame style 2016-02-25 20:26:36 +13:00
David Rowe
023c04d2fe Add optional footer to "form editor" dialogs 2016-02-25 20:25:20 +13:00
Seth Alves
cfdaf643a1 Merge pull request #7181 from sethalves/fix-grab-action
fix avatarActionHold
2016-02-24 16:28:17 -08:00
Brad Hefta-Gaub
f9b55c4b87 Merge pull request #7185 from ctrlaltdavid/20809
Fixes for new modal message dialog
2016-02-24 16:20:40 -08:00
Anthony J. Thibault
62ed5333e0 AvatarActionHold: compute velocities for other avatars 2016-02-24 15:14:56 -08:00
Anthony J. Thibault
b3b4c6473d Merge branch 'master' into fix-grab-action 2016-02-24 14:34:23 -08:00
David Rowe
b9a1c2051b Fix modal dialog not being opaque to mouse clicks 2016-02-25 10:52:16 +13:00
Brad Hefta-Gaub
568fd3e77f Merge pull request #7164 from ctrlaltdavid/20809
Restyle message box modal dialogs
2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub
1699e4a396 Merge pull request #7131 from ctrlaltdavid/20805
Restyle the Running Scripts dialog
2016-02-24 13:45:40 -08:00
Zach Pomerantz
3c4ab077be Init validOrientation for myAvatar calc 2016-02-24 13:16:45 -08:00
Zach Pomerantz
e78905a6d1 Rm previousDeltaTimeStep unused field from AvatarActionHold 2016-02-24 13:15:49 -08:00
David Rowe
51b41da488 Horizontally center short messages in the dialog 2016-02-25 09:15:07 +13:00
Seth Alves
e1b10e79df don't crash when watching someone else near-grab something 2016-02-24 12:09:51 -08:00
Brad Hefta-Gaub
2a18127a01 Merge pull request #7171 from jherico/avatar_qml_location
Allow avatar positioning from QML
2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub
3df5d0abad Merge pull request #7161 from zzmp/fix/overlay-model-scale
Use proper getter for model overlay scaling
2016-02-24 09:31:47 -08:00
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
Andrew Meadows
8d91912d4b Merge pull request #7162 from hyperlogic/tony/controller-velocity
Improve hand controller move and throw velocity
2016-02-23 17:13:13 -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
Zach Pomerantz
7ae9752272 Remove Render > Ambient Light menu 2016-02-23 16:24:43 -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
Zach Pomerantz
1f9324c78f Move Graphics... to Developer menu 2016-02-23 16:14:41 -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
Anthony J. Thibault
8f27424de7 MyAvatar: bug fix for avatar leaning 2016-02-23 14:30:51 -08: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
Brad Davis
2258a9cad9 Allow avatar positioning from QML 2016-02-23 12:16:41 -08: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
samcake
d3cdc5117f clean up one more render::Item::isValid(ID) 2016-02-23 11:01:57 -08:00
samcake
7e39cc7753 clean up a bit the 2 globals RenderItem in APplication.cpp 2016-02-23 10:53:33 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e Fix model overlay scaling 2016-02-23 10:40:47 -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
fec82e3125 Merge branch 'master' into 20805 2016-02-23 20:16:31 +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