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 |
|
Vladyslav Stelmakhovskyi
|
99c74cec41
|
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
|
2017-03-14 15:59:27 +01:00 |
|
David Rowe
|
4dd7667fd7
|
Merge branch 'tablet-ui' into 21209
# Conflicts:
# interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
# interface/src/ui/overlays/Web3DOverlay.cpp
|
2017-03-14 08:50:01 +13:00 |
|
Vladyslav Stelmakhovskyi
|
9e9c64021c
|
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
|
2017-03-13 19:54:40 +01:00 |
|
Vladyslav Stelmakhovskyi
|
48db6201e5
|
Basic statistics showed. TODO: servers statistics, coloring, wrapping
|
2017-03-13 19:48:50 +01:00 |
|
Seth Alves
|
4f71a5b234
|
Merge pull request #9864 from vladest/tablet-ui-lod-settings
Add LOD settings to Tablet UI
|
2017-03-13 08:59:40 -08:00 |
|
Seth Alves
|
ffd4d1488c
|
Merge pull request #9866 from vladest/tablet-ui-lodtools
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-13 08:59:06 -08:00 |
|
Vladyslav Stelmakhovskyi
|
49055cfa5c
|
Some statistics showed
|
2017-03-13 16:31:29 +01:00 |
|
Seth Alves
|
b3003acb97
|
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
Bring of menu window if tablet is closed on desktop
|
2017-03-12 12:20:29 -08:00 |
|
Vladyslav Stelmakhovskyi
|
81bc56f124
|
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-11 14:44:33 +01:00 |
|
Vladyslav Stelmakhovskyi
|
9f7c5a1603
|
Add LOD settings to Tablet UI
|
2017-03-11 11:54:44 +01:00 |
|
David Rowe
|
74839b24a3
|
Merge branch 'tablet-ui' into 21209
|
2017-03-11 15:56:38 +13:00 |
|
Anthony J. Thibault
|
07e10ae862
|
Merge branch 'tablet-ui' into feature/can-touch-this
|
2017-03-10 17:05:26 -08:00 |
|
Dante Ruiz
|
8a973dae3c
|
fixed bring menu dialogs in tablet
|
2017-03-10 23:21:29 +00:00 |
|
David Rowe
|
71713b10f3
|
Merge remote-tracking branch 'upstream/tablet-ui' into 21209
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
|
2017-03-11 09:14:06 +13:00 |
|
Dante Ruiz
|
78da936344
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs
|
2017-03-10 19:33:51 +00:00 |
|
Dante Ruiz
|
9b3810814e
|
fiexed putting menu items on the hud when tablet not open when on desktop screen
|
2017-03-10 18:40:18 +00:00 |
|
Seth Alves
|
fffff817a3
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-10 10:20:40 -08:00 |
|
Dante Ruiz
|
c6c0c6d382
|
toolbar becomes visible after taking a snapshot
|
2017-03-09 22:54:22 +00:00 |
|
Anthony J. Thibault
|
d8f04d90a7
|
Merge branch 'master' into feature/can-touch-this
|
2017-03-09 14:24:10 -08:00 |
|
druiz17
|
0069569e96
|
Merge branch 'tablet-ui' into 21197
|
2017-03-09 09:31:15 -08:00 |
|
druiz17
|
8750982567
|
Merge pull request #9785 from druiz17/menuFix
More dialog porting to tablet
|
2017-03-09 09:29:31 -08:00 |
|
Dante Ruiz
|
b58a27cf10
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-03-09 16:26:28 +00:00 |
|
Seth Alves
|
9435c58c2c
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1
|
2017-03-08 16:10:38 -08:00 |
|
Seth Alves
|
7f47835733
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-08 16:10:18 -08:00 |
|
David Rowe
|
1fc6d82456
|
Tablet and desktop versions of avatar attachments dialog
|
2017-03-09 13:04:57 +13:00 |
|
Seth Alves
|
28ade45f97
|
make maxFPS a property
|
2017-03-08 15:30:15 -08:00 |
|
Seth Alves
|
ae48dae96f
|
get rid of toggleTabletUI lockout period
|
2017-03-08 15:29:46 -08:00 |
|
David Rowe
|
1e3c717fd4
|
Method to show appropriate desktop or tablet dialog
|
2017-03-09 09:55:47 +13:00 |
|
David Rowe
|
950f91965d
|
Merge branch 'tablet-ui-edit-js' into 21197
|
2017-03-08 17:35:58 +13:00 |
|
Seth Alves
|
adc3581d63
|
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
|
2017-03-07 19:32:34 -08:00 |
|
Vladyslav Stelmakhovskyi
|
a02807fb26
|
Merge branch 'menuFix' into menuFix_AssetServer
|
2017-03-07 21:07:53 +01:00 |
|
Anthony J. Thibault
|
b0ad9a8110
|
Bug fix for potential crash when getting DebugDraw::instance
|
2017-03-07 10:03:38 -08:00 |
|
Seth Alves
|
f594689fa8
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 09:24:50 -08:00 |
|
Dante Ruiz
|
10ce732e91
|
Merge branch 'master' into menuFix
|
2017-03-07 16:15:54 +00:00 |
|
Brad Hefta-Gaub
|
b111bcb826
|
Merge pull request #9818 from ctrlaltdavid/21205
Remove Developer > Network > Bandwith Details dialog
|
2017-03-06 22:02:33 -08:00 |
|
David Rowe
|
fb1ff5be89
|
Port Developer > Network > Networking to tablet
|
2017-03-07 17:02:29 +13:00 |
|
David Rowe
|
51739f2f99
|
Remove Developer > Network > Bandwith Details dialog
|
2017-03-07 15:02:26 +13:00 |
|
Zach Fox
|
5223f872c1
|
Merge pull request #9753 from zfox23/FB_3234_TakeTwo
Optimize AvatarMixer with respect to Identity and Avatar Data
|
2017-03-06 13:37:29 -08:00 |
|
Andrew Meadows
|
1b8f6b9835
|
Merge pull request #9784 from samcake/blue
Fixing Emissive on overlay for models (opaque and transparent)
|
2017-03-06 13:24:00 -08:00 |
|
Vladyslav Stelmakhovskyi
|
0a36ebc5a0
|
Remove non relevant changes
|
2017-03-06 22:11:46 +01:00 |
|
David Rowe
|
af4bdd5943
|
Port Developer > Audio > Buffers to tablet
|
2017-03-07 09:57:02 +13:00 |
|
Vladyslav Stelmakhovskyi
|
6d9e7de6dc
|
Implemented AssetBrowser in Tablet view
|
2017-03-06 21:45:55 +01:00 |
|
Seth Alves
|
4886f1cbfc
|
don't run stylus-on-overlay code unless the overlay is a web3d overlay
|
2017-03-06 12:38:19 -08:00 |
|
David Rowe
|
09ecb12510
|
Merge branch 'tablet-ui-edit-js' into 21197
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
|
2017-03-07 08:59:40 +13:00 |
|
Seth Alves
|
08e2e421e4
|
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
|
2017-03-06 11:08:27 -08:00 |
|
Seth Alves
|
4b02e550db
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-06 11:07:12 -08:00 |
|
Andrew Meadows
|
6ea6477c73
|
Merge pull request #9683 from jherico/cache_flush
Clear caches on domain switch
|
2017-03-06 11:05:44 -08:00 |
|