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
Vladyslav Stelmakhovskyi
99c74cec41
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca
Merge branch 'tablet-ui' into tablet-ui-graphics
2017-03-14 15:37:36 +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
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
Vladyslav Stelmakhovskyi
49055cfa5c
Some statistics showed
2017-03-13 16:31:29 +01: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
d70943dd6c
Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences
2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi
9f7c5a1603
Add LOD settings to Tablet UI
2017-03-11 11:54:44 +01: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
David Rowe
1fc6d82456
Tablet and desktop versions of avatar attachments dialog
2017-03-09 13:04:57 +13:00
David Rowe
950f91965d
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-08 17:35:58 +13: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
David Rowe
af4bdd5943
Port Developer > Audio > Buffers to tablet
2017-03-07 09:57:02 +13:00
David Rowe
6385bb2b80
Open general settings dialog in tablet from tablet menu
2017-03-04 15:57:58 +13:00
David Rowe
9384dfd89c
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-03 18:05:18 +13:00
David Rowe
b9869264ba
Display avatar settings dialog in tablet
2017-03-02 13:16:23 +13:00
Menithal
7a5665ff4f
Hotkey change to make AudioScope similar to earlier
2017-02-16 10:09:19 +02:00
Menithal
ff2c344eaa
Migrated Audioscope Hotkeys to use F2 instead of P
...
Apparently ctrl + shift + P which was planned to be used in the client
for unparenting entities did not work out, as the command went out of
the main view.
Migrating to ctrl + F2 and ctrl + alt + F2
2017-02-16 10:05:01 +02:00
Menithal
6302ae6bd5
Changed AudioScope Hotkeys, Allowing User Hotkeys
...
AudioScope Open Hotkey changed from Ctrl + P to Ctrl + Alt + P and
Audioscope Pause Hotkey changed from Ctrl + Shift + P to Ctrl + Shift +
Alt + P
2017-02-15 19:48:29 +02:00
Atlante45
6fbe3c9187
Windows specific changes
2017-02-09 13:04:43 -08:00
Atlante45
191121888c
Add log window to the ESS log
2017-02-09 13:04:43 -08:00
Faye Li
c98a8168ee
uncheck "show meter level" by default
2017-01-10 09:53:55 -08:00
Brad Hefta-Gaub
e6a20102d4
debug window enhancements
2016-12-21 11:31:34 -08:00
Chris Collins
6d4b1c4b97
Merge pull request #9155 from jherico/text_degrade_fix
...
Fix drop in text rendering quality when texture memory is low
2016-12-06 09:23:32 -08:00
Andrew Meadows
7db8e8f31b
Merge pull request #9156 from hyperlogic/out-of-body-revert
...
Revert Out of Body experience
2016-12-06 08:37:20 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Bradley Austin Davis
2ca4d0ab29
Fix drop in text rendering quality on texture memory constrained systems
2016-12-05 14:12:57 -08:00
Ryan Jones
094857949d
tabs -> spaces, remove raw ptr, remove unnecessary spec diff
2016-12-05 12:57:21 -08:00
Ryan Jones
3eecba77f2
working menu item
2016-12-03 19:34:38 -08:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
Brad Davis
db98a742b6
Remove incremental transfers
2016-11-10 08:35:35 -08:00
Brad Davis
192c72ff99
Update menu, initial state for texture management
2016-11-09 12:09:25 -08:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
Brad Hefta-Gaub
76344f3253
add a menu item to run audio stats script
2016-10-26 22:41:56 -07:00
Andrew Meadows
38e4ac0ae9
Merge master into out-of-body-experience
2016-10-26 16:59:31 -07:00
Brad Davis
1c89fa2291
Make threaded submit in OpenVR controllable from menu
2016-10-26 15:28:42 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
Andrew Meadows
51a9a99381
Merge hifi/master into hifi/out-of-body-experience
2016-10-24 08:13:42 -07:00
Andrew Meadows
e44672180a
add Bullet profile info to PerformanceTimer stats
2016-10-21 13:22:22 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Anthony J. Thibault
2fdd5e4368
Build fixes for change in getMyAvatar() from DepenencyManager
...
It now returns a smart_ptr, not a raw pointer.
2016-10-05 17:57:48 -07:00
Anthony J. Thibault
cc7a6ada38
Merge branch 'master' into out-of-body-experience
2016-10-05 17:16:39 -07:00
Clément Brisset
d18394f249
Merge pull request #8596 from huffman/feat/my-avatar-self-id
...
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Anthony J. Thibault
eccd01e88f
Merge remote-tracking branch 'upstream/master' into out-of-body-experience
2016-09-29 16:36:25 -07:00
Brad Hefta-Gaub
38eccd32a8
add developer menu support to enable/disable dynamic texture management
2016-09-29 10:18:54 -07:00
Anthony Thibault
27e6c0f872
Added debug draw path trace for left and right feet
2016-09-24 13:01:16 -07:00
Zach Pomerantz
277eefafd7
remove the audio stats dialog
2016-09-23 14:39:07 -07:00
