luiscuenca
38bfddf786
Added filter for QT autogenerated functions and integrated it to Developers menu
2017-12-21 16:26:06 -07:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Andrew Meadows
02e3b22621
remove hot-key for disable of scripted motor
2017-12-20 08:43:56 -08:00
Andrew Meadows
f82de05f9c
defang accidental disable of MyAvatar's default motor
2017-12-20 08:42:42 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Andrew Meadows
74a1f5de96
remove bullet stats when physics stats disabled
2017-12-11 11:31:00 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
luiscuenca
390c59b45c
Change menu and minor fixes
2017-12-04 15:29:01 -08:00
luiscuenca
ad02118588
fixed menu error
2017-11-26 23:43:13 -07:00
luiscuenca
027d2d323c
Measure tool and corrections
2017-11-26 22:28:34 -07:00
Alexander Ivash
c4aa937108
adjust to coding standards
2017-11-18 11:16:40 +03:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
vladest
2f86658308
Move Tablet becomes toolbar menu from General to Developer menu
2017-09-14 16:37:02 +02:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
beholder
cbbe03cee7
6788: You can deselect your current view mode
2017-08-25 02:33:11 +03:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
Anthony J. Thibault
49adf04913
Added Developer > Avatar > Show Detailed Collision menu option
2017-08-10 16:36:09 -07:00
humbletim
3bcbec87e0
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-30 16:15:34 -04:00
Seth Alves
9c9cfad4c4
use ctrl rather than alt to activate camera-mode shortcuts
2017-07-26 15:56:08 -07:00
Seth Alves
766c6f48c3
third person camera is alt+G rather than alt+O
2017-07-24 17:43:01 -07:00
Seth Alves
82a787a753
use alt+h for mirror-mode
2017-07-24 16:04:11 -07:00
Seth Alves
e53badf88b
use alt+f for 1st person camera and alt+o for 3rd
2017-07-24 15:56:37 -07:00
humbletim
f9e0e616f7
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-18 17:34:39 -04:00
Andrew Meadows
364600c447
fix rendering of simulation ownership debug icons
2017-07-12 11:12:47 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Dante Ruiz
9e4b5693c7
fixed merge conflicts
2017-07-06 18:49:46 +01:00
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
1P-Cusack
38baeabbe5
Add View->Enter First Person Mode in HMD checkbox.
...
When checked, changing to an HMD display will switch the user to first
person mode. WL 21425.
2017-07-03 15:21:40 -04:00
humbletim
026e05f80c
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-03 11:55:59 -04:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
humbletim
f6262ad54d
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-06-23 16:37:10 -04:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
David Kelly
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Andrew Meadows
62e862fef0
Merge pull request #10733 from Menithal/21384
...
21384: Added Support to Disabling flight from client side
2017-06-22 13:38:01 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
Dante Ruiz
2c3db0fb91
finished calibration-ui
2017-06-21 01:07:12 +01:00
Dante Ruiz
13dff29bd5
adding calibration screen
2017-06-20 01:19:10 +01:00
Dante Ruiz
da29157a3c
fixed merge conflict'
2017-06-17 00:40:50 +01:00
humbletim
fc33e95e2d
Merge branch 'master' into 21180-C++
2017-06-16 16:16:42 -04:00
David Rowe
a8501a7ac6
Remove old Leap Motion code
2017-06-15 14:45:40 +12:00
Menithal
c92e22fd20
21384: Added Menu Option
2017-06-14 19:05:00 +03:00
Zach Pomerantz
b24681125d
rm debugging
2017-06-13 18:16:16 -04:00
Zach Pomerantz
a8f69bb2e0
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-13 17:41:52 -04:00
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04:00
Zach Pomerantz
2b99f299c8
testing
2017-06-06 17:54:52 -04:00
Dante Ruiz
038ffe920a
fixing merge conflicts
2017-06-06 16:42:08 +01:00
Zach Pomerantz
d8815d1dce
prep audio menu
2017-06-05 16:24:00 -04:00
humbletim
7cab0363a9
standalone 21180 branch with just the C++ changes
2017-06-05 15:57:54 -04:00
Zach Pomerantz
7cb38d22c3
fix AudioBuffers to work in tablet
2017-06-05 15:06:47 -04:00
Dante Ruiz
f0f10f74c6
inpput configutration stub
2017-06-03 00:30:00 +01:00
Brad Davis
1f95daf5c1
Add dev menu option to wipe KTX cache on next launch
2017-06-02 11:19:43 -07:00
Zach Pomerantz
2b40ad4275
mv Audio... to Settings as dialog
2017-05-28 17:42:24 -04:00
Zach Pomerantz
8ca8c3aa69
mv AudioPreferencesDialog to AudioBuffers
2017-05-28 17:40:57 -04:00
Zach Pomerantz
156b3f9738
use showDialog instead of toggleMenu
2017-05-28 17:10:59 -04:00
Zach Pomerantz
637a448c2c
abstract toggleMenu
2017-05-26 17:12:15 -04:00
Dante Ruiz
54d63f5155
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-23 18:19:38 +01:00
Anthony J. Thibault
e99001d86c
debug draw ik chains, bug fix for flex coef on tips
...
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
Dante Ruiz
975b1ab077
moved low velocity filter in the input system
2017-05-16 00:15:06 +01:00
Anthony J. Thibault
93b8dc550c
Merge branch 'master' into feature/ik-solver-init-config
2017-05-10 09:03:21 -07:00
Anthony J. Thibault
7af93f9fea
Hooked up IK constraint rendering
2017-05-08 15:06:29 -07:00
Andrew Meadows
63042eea3a
fix flawed fix of bad rebase
2017-05-05 09:37:00 -07:00
Andrew Meadows
41ad25ade1
fix bad rebase of changed menu option
2017-05-05 09:37:00 -07:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Andrew Meadows
5cf233db3a
less labyrinth
2017-04-27 13:16:50 -07:00
Andrew Meadows
aa90a6bd02
use static methods for setting avatar debug options
2017-04-27 13:16:50 -07:00
Andrew Meadows
00b05ed137
connect menu options to avatar render features
2017-04-27 13:16:50 -07:00
Triplelexx
f795027ab7
change menu item locations
...
AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.
2017-04-27 01:09:04 +01:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
Zach Fox
d9dc8ebc41
More improvements
2017-04-13 15:48:51 -07:00
Triplelexx
01b13d7032
fix crash when pressing "Bookmark Avatar" button
...
also modified LocationBookmarks for consistency
2017-04-04 18:05:00 +01:00
Triplelexx
50e35a220b
Merge remote-tracking branch 'upstream/master' into 21224
2017-03-30 01:25:27 +01:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Anthony J. Thibault
dd17b2e2f3
Added developer option to draw IK targets in world.
...
(cherry picked from commit 7e7803c648
2017-03-24 16:20:52 -07:00
Triplelexx
bda1d54209
create AvatarBookmarks
...
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
2017-03-24 22:58:36 +00: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
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
Chris Collins
509057c6d8
Merge pull request #9941 from Triplelexx/21232
...
21232 - Remove Mini Mirror from View menu
2017-03-20 09:55:37 -07:00
Chris Collins
ed27c550af
Merge pull request #9939 from ctrlaltdavid/21237
...
Disable Developer > Assets > ATP Asset Migration menu item
2017-03-20 06:29:33 -07:00
Seth Alves
424af2255b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-19 21:17:30 -08:00
Mohammed Nafees
3612b9fccc
Remove Edit > Scripts Editor and all related source files
2017-03-20 00:25:50 -04: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
David Rowe
ab7d82edb6
Use #ifdef instead of comment
2017-03-18 12:56:34 +13:00
David Rowe
38bb48e72c
Disable Developer > Assets > ATP Asset Migration menu item
2017-03-18 12:13:13 +13:00
David Rowe
e3b9d588ec
Merge branch 'master' into 21235
...
# Conflicts:
# interface/src/Menu.cpp
# interface/src/ui/DialogsManager.h
2017-03-18 09:42:36 +13:00
Triplelexx
eba6c8de5e
remove About Interface from File menu
2017-03-17 17:37:19 +00:00
David Rowe
939b4f1612
Remove Developer > Network > Disk Cache Editor menu item and dialog
2017-03-17 13:49:09 +13:00
David Rowe
e21d7d9edf
Add Developer > Network > Clear Disk Cache menu action
2017-03-17 13:34:11 +13:00
David Rowe
dc71f502f0
Delete Developer > Network > RAM Caches Size menu item and dialog
2017-03-17 13:09:06 +13:00
Vladyslav Stelmakhovskyi
856e15060d
Implemented Domain Connection statistics for Tablet UI
2017-03-15 21:05:13 +01: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
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
Anthony J. Thibault
98ffea2fb9
Merge branch 'master' into out-of-body-experience
2016-09-22 18:08:23 -07:00
