kasenvr
|
c7fbddf024
|
Merge pull request #631 from vegaslon/bug/TestFixAvatarApp
Test moving to qt image error handling in avatar app
|
2020-09-02 18:50:31 -04:00 |
|
Vegaslon
|
c6fbe08a8f
|
Test moving to qt image error handling instead of creating own in attempt to fix avatar app slow down.
|
2020-08-20 08:59:57 -04:00 |
|
David Rowe
|
70fd954ef4
|
Replace the "HifiAbout" API with a new "About" API
|
2020-08-17 11:34:58 +12:00 |
|
David Rowe
|
233deae44d
|
Increase graphics settings' resolution scale item maximum to 2.0
|
2020-07-18 20:50:52 +12:00 |
|
David Rowe
|
8dd8ebcbaf
|
Merge branch 'master' into feature/eye-tracking-option
# Conflicts:
# plugins/openvr/src/ViveControllerManager.cpp
|
2020-07-11 08:14:13 +12:00 |
|
David Rowe
|
6e1af6df73
|
Update copyright notices
|
2020-07-10 07:18:29 +12:00 |
|
Julian Groß
|
6737068b02
|
Test
|
2020-07-07 00:28:19 +02:00 |
|
David Rowe
|
52389e5804
|
Add correct privacy policy URL
|
2020-07-05 11:17:56 +12:00 |
|
motofckr9k
|
bb91c1c89b
|
Fix blocks
|
2020-07-03 10:22:06 +02:00 |
|
David Rowe
|
06010dbcae
|
Fix position of recommended puck placement dialog
|
2020-06-27 15:54:28 +12:00 |
|
David Rowe
|
258fc8a2f4
|
Improve some text and make checkboxes square
|
2020-06-27 15:54:15 +12:00 |
|
David Rowe
|
2e9a8e2b33
|
Add option to enable Vive PRO Eye eye tracking
|
2020-06-27 15:14:21 +12:00 |
|
motofckr9k
|
878c6c68c8
|
Fix inputView if statement
|
2020-06-19 23:46:04 +02:00 |
|
motofckr9k
|
3aefa6ad9c
|
Remove if statements that are not needed anymore
|
2020-06-19 23:37:26 +02:00 |
|
motofckr9k
|
0c8cc0a806
|
Try to remove empty space when "Test your voice" button is not visible
|
2020-06-19 23:32:52 +02:00 |
|
motofckr9k
|
845cc4454c
|
Add Vircadia contributors line
|
2020-06-19 21:47:09 +02:00 |
|
motofckr9k
|
4a0d011b53
|
Shorten PushToTalk text on vr, since it didn't fit into the window
|
2020-06-19 21:39:53 +02:00 |
|
motofckr9k
|
d4f79413eb
|
Fix seperator and move up inputLevel
|
2020-06-19 21:27:41 +02:00 |
|
motofckr9k
|
ee6de9e868
|
Move "Test your voice" and "Test your sound" to top of their category
|
2020-06-19 21:10:48 +02:00 |
|
motofckr9k
|
8284dd16cf
|
Revert last commit and add spacer item to bottom.
|
2020-06-19 20:19:03 +02:00 |
|
motofckr9k
|
b0eb08c03f
|
Try to add bottom margin
|
2020-06-19 19:54:49 +02:00 |
|
motofckr9k
|
6b8519c7ff
|
Fix "Test your sound"
|
2020-06-19 19:38:03 +02:00 |
|
motofckr9k
|
eaf2ce89e0
|
Actually move it up this time
|
2020-06-19 19:23:51 +02:00 |
|
motofckr9k
|
37bded0a9b
|
Move volume control up from bottom
|
2020-06-19 18:48:43 +02:00 |
|
Julian Groß
|
18318fdf71
|
Merge branch 'v2020.2.2-rc' into rebrand
|
2020-06-18 09:16:47 +02:00 |
|
motofckr9k
|
256b466e84
|
Add vircadia-banner.svg for login dialogs
|
2020-06-18 09:12:01 +02:00 |
|
kasenvr
|
80fc2d8332
|
Merge pull request #426 from ctrlaltdavid/fix/wearables-text-unreadable
Fix visibility of values in Wearables dialog
|
2020-06-11 17:15:49 -04:00 |
|
motofckr9k
|
3d05cdd61e
|
Merge remote-tracking branch 'refs/remotes/kasen/master'
Conflicts:
BUILD_WIN.md
CODING_STANDARD.md
LICENSE
cmake/installer/installer-header.bmp
cmake/installer/installer.ico
cmake/installer/uninstaller-header.bmp
interface/resources/images/about-vircadia.png
interface/resources/images/vircadia-logo.svg
interface/resources/qml/LoginDialog.qml
interface/resources/qml/dialogs/TabletLoginDialog.qml
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
interface/src/Application.cpp
pkg-scripts/athena-server.spec
scripts/system/more/app-more.js
scripts/system/more/css/styles.css
scripts/system/more/more.html
|
2020-06-10 02:49:13 +02:00 |
|
Kasen IO
|
085b9e11c5
|
Fix tabletAboutDialog fit for logo.
|
2020-06-06 20:21:17 -04:00 |
|
Kasen IO
|
fda40d56d4
|
Merge branch 'master' into feature/further-rebranding
|
2020-06-06 18:43:03 -04:00 |
|
Kasen IO
|
01b02881dc
|
Height, width, and centering updates.
|
2020-06-06 18:40:19 -04:00 |
|
David Rowe
|
8494e6e6b5
|
Fix visibility of values in Wearables dialog
|
2020-06-06 15:15:03 +12:00 |
|
Kasen IO
|
6c6a405020
|
Add periods and remove double copyright in tabletaboutdialog.qml
|
2020-05-25 16:41:16 -04:00 |
|
Kasen IO
|
a4bf1c4d82
|
Update copyright headers.
|
2020-05-25 15:59:43 -04:00 |
|
motofckr9k
|
d406b81b47
|
Big rebrand
|
2020-05-22 20:35:27 +02:00 |
|
Kasen IO
|
ce1a1faf79
|
Fix copyright headers + some docs.
|
2020-05-20 15:02:03 -04:00 |
|
kasenvr
|
7996698c8f
|
Merge branch 'master' into fix/other-renamings
|
2020-05-18 15:10:32 -04:00 |
|
Kasen IO
|
f908d5bb0a
|
Undo logo change.
|
2020-05-17 22:20:02 -04:00 |
|
|
|
187a2749c3
|
Rebrand the About dialog to Vircadia.
Also removes trailing whitespace from Menu.cpp.
|
2020-05-17 14:26:45 -05:00 |
|
Kasen IO
|
f4bcc82dd6
|
Corrections.
|
2020-05-16 02:27:45 -04:00 |
|
David Rowe
|
5e997d7b60
|
Fix up Vircadia URLs
|
2020-04-27 20:38:23 +12:00 |
|
David Rowe
|
2d070e630b
|
Merge branch 'master' into fix/jsdoc-fixes
# Conflicts:
# interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
# interface/resources/qml/hifi/commerce/checkout/Checkout.qml
# interface/resources/qml/hifi/commerce/purchases/Purchases.qml
# interface/src/Application.cpp
|
2020-04-26 20:38:43 +12:00 |
|
David Rowe
|
ffeb37e7aa
|
Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
# CMakeLists.txt
# README.md
# cmake/externals/glad32es/CMakeLists.txt
# cmake/externals/glad41/CMakeLists.txt
# cmake/externals/glad45/CMakeLists.txt
# cmake/externals/polyvox/CMakeLists.txt
# cmake/externals/quazip/CMakeLists.txt
# cmake/externals/vhacd/CMakeLists.txt
# cmake/init.cmake
# cmake/ports/hifi-deps/CONTROL
# cmake/ports/sdl2/CONTROL
# cmake/ports/sdl2/disable-hidapi-for-uwp.patch
# cmake/ports/sdl2/enable-winrt-cmake.patch
# cmake/ports/sdl2/fix-arm64-headers.patch
# cmake/ports/sdl2/fix-x86-windows.patch
# cmake/ports/sdl2/portfile.cmake
# cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
# cmake/ports/tbb/portfile.cmake
# hifi_vcpkg.py
# interface/src/avatar/MyAvatar.h
# libraries/avatars-renderer/src/avatars-renderer/Avatar.h
# libraries/avatars/src/AvatarData.h
# libraries/entities-renderer/src/RenderableEntityItem.h
# libraries/entities/src/EntityItem.cpp
# libraries/entities/src/EntityItem.h
# libraries/fbx/src/GLTFSerializer.cpp
# libraries/graphics-scripting/src/graphics-scripting/Forward.h
# libraries/networking/src/AddressManager.cpp
# libraries/networking/src/DomainHandler.h
# libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
# libraries/render-utils/src/HighlightEffect.cpp
# libraries/render-utils/src/MeshPartPayload.cpp
# libraries/render-utils/src/Model.cpp
# libraries/render-utils/src/RenderShadowTask.cpp
# libraries/script-engine/src/WebSocketClass.cpp
|
2020-04-09 16:46:27 +12:00 |
|
Kasen IO
|
9dce990e8f
|
Help dialog updated.
|
2020-04-07 18:48:24 -04:00 |
|
Kasen IO
|
115c40bd54
|
Lots of renamings, more to come.
|
2020-04-07 04:56:02 -04:00 |
|
kasenvr
|
cb0a080be1
|
Merge pull request #113 from ctrlaltdavid/fix/missing-scrollbars
Always display vertical scrollbar in Settings dialogs that scroll
|
2020-02-19 16:32:53 -05:00 |
|
Vegaslon
|
c2b375862c
|
Style changes as requested
|
2020-02-11 21:50:40 -05:00 |
|
Vegaslon
|
6db15510db
|
Change name of variable and fix indention
|
2020-02-10 16:20:22 -05:00 |
|
Vegaslon
|
e74fccb49d
|
Allow users to set avatar thumbnails that show in avatar app.
|
2020-02-01 08:54:06 -05:00 |
|
Kasen IO
|
428a5b65ff
|
Lint
|
2020-01-27 13:13:36 -05:00 |
|
