Dante Ruiz
ae111ff2e9
Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto
2017-03-23 18:25:31 +01:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Dante Ruiz
af97c7275e
Use loadQMlSource if no stack is aviable
2017-03-23 17:03:24 +01:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Chris Collins
ea13151d55
Merge pull request #9945 from mnafees/21233
...
21233: Remove Scripts Editor option from Edit menu and all related files
2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi
fb0adae0b1
Scripts debug window in Tablet UI
2017-03-21 15:04:38 +01:00
Zach Pomerantz
20ea13e00a
Merge pull request #9897 from zzmp/record/noise-gate
...
Add AudioNoiseGate to recordings played through Interface
2017-03-21 00:21:20 -04:00
Faye Li
9cab8b6c4a
end of day commit
2017-03-20 17:04:29 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Faye Li
1d095b8158
added back forward and back button on nav bar
2017-03-20 15:57:59 -07:00
Faye Li
b6bf58d5be
rearrange layout of main tablet go to screen
2017-03-20 15:28:30 -07:00
Seth Alves
2e29ff3114
Merge pull request #9934 from fayeli/edit-import-entities
...
Adding Import Entities button on the Create tab of Edit
2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub
af790d8474
Merge pull request #9875 from birarda/bug/spin-strafe
...
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Chris Collins
af2748410d
Merge pull request #9932 from Triplelexx/21231
...
21231 - Remove About Interface from File menu
2017-03-20 09:55:57 -07:00
Mohammed Nafees
c460523980
Remove related icon files for Scripts Editor
2017-03-20 00:25:50 -04:00
Seth Alves
f48557b06b
Merge pull request #9943 from vladest/tablet-ui-login-logout
...
Tablet ui login logout
2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi
5335bf8862
Menu items in Tablet UI now wrapped
2017-03-18 15:58:16 +01:00
Vladyslav Stelmakhovskyi
696825580e
Merge branch 'tablet-ui' into tablet-ui-login-logout
2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi
5e162a6447
Implemented login facility for tablet UI
2017-03-18 14:38:49 +01:00
Triplelexx
a9b1a38665
remove Mini Mirror from View menu
...
Avatar inputs only contains the audio meter now.
2017-03-18 00:53:13 +00:00
Faye Li
33a7ff825e
indicate expecting json file on button text
2017-03-17 11:37:38 -07:00
Faye Li
6531efffbc
hook up qml button to edit.js
2017-03-17 11:22:07 -07:00
Triplelexx
eba6c8de5e
remove About Interface from File menu
2017-03-17 17:37:19 +00:00
Seth Alves
df84ff27e9
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-17 07:52:22 -07:00
Seth Alves
a5d19439f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-16 16:32:07 -07:00
David Rowe
07e4b0ce41
Fix title menu icon getting stuck on white
2017-03-17 11:28:14 +13:00
David Rowe
069e66b875
Fix stack functions
2017-03-17 11:19:50 +13:00
David Rowe
f1947769d6
Fix tablet settings dialogs' titles and make QML consistent
2017-03-17 11:15:56 +13:00
Andrew Meadows
6f4d9bfba3
Merge pull request #9858 from kunalgosar/logBolding
...
Change to Log Font and Formatting
2017-03-16 13:09:37 -07:00
kunalgosar
0cee9ee172
font change
2017-03-16 11:57:46 -07:00
David Rowe
1080e21afd
Tidying
2017-03-16 19:28:28 +13:00
David Rowe
89eb073855
Fix dialog height changing as drop-down value is changed
2017-03-16 19:28:12 +13:00
David Rowe
74db9dc573
Fix drop-down hiding behind buttons
2017-03-16 19:27:47 +13:00
David Rowe
3c1506237a
Fix not all warning text displaying
2017-03-16 19:27:27 +13:00
David Rowe
7efda8bead
Make clicking on dialog background defocus current control
2017-03-16 19:27:06 +13:00
David Rowe
9e458fd180
Fix keyboard in tablet custom query dialog
2017-03-16 19:26:41 +13:00
Faye Li
10ebb6efd7
simplify asset server button
2017-03-15 16:55:21 -07:00
Faye Li
42216b6986
create import entities button on create tab
2017-03-15 16:47:31 -07:00
Vladyslav Stelmakhovskyi
856e15060d
Implemented Domain Connection statistics for Tablet UI
2017-03-15 21:05:13 +01:00
Zach Pomerantz
789bb7c855
rename audio(Mic)OutboundPPS
2017-03-15 13:30:39 -04:00
Seth Alves
563d59bda9
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
...
Tablet ui entity statistics
2017-03-15 08:40:52 -08:00
Seth Alves
df82c30e83
Merge pull request #9892 from hyperlogic/bug-fix/tablet-running-scripts-improvements
...
Tablet Running Scripts dialog fixes
2017-03-15 08:38:40 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Anthony J. Thibault
3a788d31de
Tablet Running Scripts dialog fixes
...
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable. We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
2017-03-14 15:38:53 -07:00
Stephen Birarda
1fe02477b0
fix LX behaviour in snap/advanced/basic
2017-03-14 14:21:21 -07:00
Dante Ruiz
4c686eaa67
fix tablet menu stack focus issue
2017-03-14 21:20:41 +01:00
Vladyslav Stelmakhovskyi
e2a4011b05
Coloring implemented
2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077
Servers stats added. TODO: coloring
2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi
d9ca8a826d
TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats
2017-03-14 17:02:09 +01:00
