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 |
|
kasenvr
|
fc73f76ab7
|
Update interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
Co-Authored-By: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
|
2020-01-25 19:02:01 -05:00 |
|
Kasen IO
|
aa0c225809
|
Merge branch 'kasen/core' into fix/whitelist-qml-adds
|
2020-01-24 19:55:23 -05:00 |
|
David Rowe
|
7ed117dfcb
|
Replace links to docs.highfidelity.com
|
2020-01-24 10:18:55 +13:00 |
|
Kasen IO
|
1979a4bd94
|
Further housekeeping. :)
|
2020-01-23 03:15:18 -05:00 |
|
Kasen IO
|
c121a8ef2a
|
Housekeeping.
|
2020-01-23 03:06:58 -05:00 |
|
David Rowe
|
cfde36c9f5
|
Fix up scrollbars and separators
|
2020-01-23 11:25:48 +13:00 |
|
Kasen IO
|
7a985b445e
|
removed extra debug, added debug for user awareness.
|
2020-01-22 14:53:55 -05:00 |
|
Kasen IO
|
98473abbb4
|
QML works, C++ works but does a manual set to true, does not see updates from QML set setting.
|
2020-01-22 11:29:37 -05:00 |
|
David Rowe
|
6c81f597af
|
Display vertical scrollbar in Settings dialogs that scroll
|
2020-01-22 20:55:50 +13:00 |
|
Kasen IO
|
bd066adbf6
|
Whitelist toggle not working c++ side.
|
2020-01-20 16:03:48 -05:00 |
|
David Rowe
|
eae3336f57
|
Fix up docs links
|
2020-01-20 15:06:32 +13:00 |
|
|
|
96dc01fcc6
|
Made requested changes to About dialog.
Removed dash from "open source"
Fixed missing and unecessary periods.
|
2020-01-12 12:47:17 -06:00 |
|
|
|
00855cba3d
|
Redo the About menu dialog
Change project name, remove references to EOS blockchain, add Project Athena copyright, add attribution to Opus.
|
2020-01-10 16:09:20 -06:00 |
|
kasenvr
|
19bca588ca
|
Merge pull request #58 from ctrlaltdavid/fix/avatar-packager-update
Update Avatar Packager
|
2020-01-07 22:43:34 -05:00 |
|
kasenvr
|
be08a949c2
|
Merge pull request #67 from FluffyJenkins/feature/fixedClaraRubbish
Fixed clara rubbish
|
2020-01-07 21:44:23 -05:00 |
|
Fluffy Jenkins
|
e488a66840
|
changed quote types
|
2020-01-07 20:59:00 +00:00 |
|
Fluffy Jenkins
|
ead359ce67
|
Fixed clara rubbish
|
2020-01-07 05:14:38 +00:00 |
|
David Rowe
|
1d9aec6fec
|
Improve order of dialog contents
|
2020-01-05 18:24:56 +13:00 |
|
David Rowe
|
977d498004
|
Add an "Open Project Folder" button
|
2020-01-05 17:53:36 +13:00 |
|
David Rowe
|
30c63fc305
|
Remove "Upload" button and associated items
|
2020-01-05 17:11:23 +13:00 |
|
David Rowe
|
cd6669ec8b
|
Comment out the "Video" button
|
2020-01-05 17:00:40 +13:00 |
|
David Rowe
|
d79c87b2d4
|
Change Avatar Package docs links
|
2020-01-05 16:59:51 +13:00 |
|
Kasen IO
|
7489505f99
|
Updated whitelist info and name to include QML.
|
2019-12-26 22:27:58 -05:00 |
|
Kasen IO
|
d4c3504c8d
|
Updated about dialog (old logo still there), application name, and readme.md
|
2019-12-14 23:12:54 -05:00 |
|
