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 |
|
David Rowe
|
7ed117dfcb
|
Replace links to docs.highfidelity.com
|
2020-01-24 10:18:55 +13:00 |
|
David Rowe
|
60d2845953
|
Remove further related dead code
|
2019-11-19 10:31:54 +13:00 |
|
David Rowe
|
748999b8d6
|
Remove reference to BodyMart in Avatar app
|
2019-11-19 09:59:59 +13:00 |
|
David Rowe
|
a912e97f1e
|
Remove reference to AvatarIsland in Avatar app
|
2019-11-19 09:53:58 +13:00 |
|
Zach Fox
|
b6344acc1d
|
Big checkpoint. be aware - things may be broken
|
2018-10-30 15:08:13 -07:00 |
|
Howard Stearns
|
e3b1e14db6
|
nix "buy" where possible.
|
2018-10-25 12:37:08 -07:00 |
|
Alexander Ivash
|
cfb820762d
|
bulk adjusting to coding guidelines
|
2018-08-22 00:42:01 +03:00 |
|
elderorb
|
ea22fdb400
|
Merge branch 'master' into FB17184
|
2018-08-16 02:08:47 +03:00 |
|
Alexander Ivash
|
c1ebadfdd8
|
adjust text in 'get wearables' popup
|
2018-08-11 00:43:39 +03:00 |
|
Alexander Ivash
|
90fb0d7be6
|
add possibility to add wearable from external url
|
2018-08-10 17:59:11 +03:00 |
|
Alexander Ivash
|
9234813e08
|
bring back 'get more' wearables button
|
2018-08-10 14:54:15 +03:00 |
|
Alexander Ivash
|
a85ed2a2f5
|
show 'edit wearables' button even if avatar doesn't have any wearables
|
2018-08-10 12:58:44 +03:00 |
|
David Rowe
|
f9d9324a14
|
Improve text in Avatar app's pop-ups
|
2018-08-04 10:55:57 +12:00 |
|
John Conklin II
|
221dd3ee88
|
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes
FB16992 - Layout changes to the two lightboxes in the Avatar app
|
2018-07-31 09:36:16 -07:00 |
|
Alexander Ivash
|
c13f27e2eb
|
FB17023 - Make visible avatar url in the avatar app
|
2018-07-24 22:10:18 +03:00 |
|
Alexander Ivash
|
e12569c747
|
FB16992 - Layout changes to the two lightboxes in the Avatar app
|
2018-07-23 23:24:17 +03:00 |
|
Alexander Ivash
|
e943a607b0
|
'Wear wearable' => 'Wear wearables' (from QA feedback)
|
2018-07-06 21:00:56 +03:00 |
|
Alexander Ivash
|
48fc81b082
|
Buy wearables from Marketplace [new line]
Wear wearable from My Purchases [new line]
|
2018-07-06 21:00:55 +03:00 |
|
Alexander Ivash
|
8d921b123d
|
The new layout from zeplin (https://zpl.io/aMm76Yr)
|
2018-07-06 21:00:55 +03:00 |
|
Alexander Ivash
|
46992f04ad
|
replace bodymart & avatarisland images
|
2018-07-06 21:00:55 +03:00 |
|
Alexander Ivash
|
764dc6d156
|
add link to 'external avatar' dialog
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
91e1714b0e
|
external avatars support
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
856c95b52a
|
move avatarapp-specific images into appropriate subfolder
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
bcb373618f
|
navigation to market / my purchases from message dialog links
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
6ff397e9e0
|
move all messagebox-es into dedicated component
|
2018-07-06 21:00:53 +03:00 |
|