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 |
|
kasenvr
|
86d18e3706
|
Merge pull request #160 from ctrlaltdavid/fix/http-serverless
Add support for serverless domains via HTTP/HTTPS
|
2020-02-19 16:24:56 -05:00 |
|
kasenvr
|
48ae156db7
|
Merge pull request #104 from daleglass/implicit_copy_constructor
Make default copy constructors explicit
|
2020-02-08 14:45:44 -05:00 |
|
David Rowe
|
e6c54faaf2
|
Merge branch 'kasen/core' into fix/http-serverless
|
2020-02-07 11:32:38 +13:00 |
|
David Rowe
|
7c87f89712
|
Add FIXME for Clipboard.importEntities()
|
2020-02-07 11:12:54 +13:00 |
|
David Rowe
|
4f0cc2ebd5
|
Remove dead code
|
2020-02-06 11:28:51 +13:00 |
|
David Rowe
|
ad427e31a7
|
Make --url take existing Interface to FILE, HTTP, and HTTPS serverless
|
2020-02-06 11:11:41 +13:00 |
|
Kasen IO
|
08ec9ef3b7
|
Various URL updates + window title update.
|
2020-02-05 15:25:51 -05:00 |
|
David Rowe
|
46173439ed
|
Enable serverless domains via HTTP and HTTPS
|
2020-02-01 12:46:28 +13: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
|
fbaf0ea56b
|
Remove debugging cache clearer.
|
2020-01-22 15:08:26 -05:00 |
|
Kasen IO
|
bd066adbf6
|
Whitelist toggle not working c++ side.
|
2020-01-20 16:03:48 -05:00 |
|
David Rowe
|
0666c3bbb1
|
Document that MyAvatar goto methods have safe landing
|
2020-01-20 21:31:50 +13:00 |
|
David Rowe
|
b816d7053a
|
Update models used in JSDoc examples
|
2020-01-20 21:07:33 +13:00 |
|
David Rowe
|
eae3336f57
|
Fix up docs links
|
2020-01-20 15:06:32 +13:00 |
|
David Rowe
|
1a4266a64a
|
Review JSDoc updates from recent commits
|
2020-01-20 14:33:06 +13:00 |
|
Dale Glass
|
68d10a2fe1
|
Make default copy constructors explicit
Recent versions of gcc generate a warning without this
|
2020-01-19 00:20:49 +01:00 |
|
|
|
f5fcb90cac
|
Revert "Removed obsolete default scripts + more branding changes."
|
2020-01-16 18:51:49 -06:00 |
|
|
|
e5dd23b922
|
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
|
2020-01-14 18:40:04 -06:00 |
|
|
|
653b333060
|
Merge pull request #85 from kasenvr/fix/obsolete-apps
Removed obsolete default scripts + more branding changes.
|
2020-01-14 12:33:30 -06:00 |
|
David Rowe
|
ec1e6bc7d3
|
Merge branch 'DOC-55-C' into api-docs
|
2020-01-14 18:04:32 +13:00 |
|
kasenvr
|
1133f51971
|
Merge pull request #70 from Nex-Pro/kasen/core
Rebranding of login dialogs etc. QML
|
2020-01-13 09:42:09 -05:00 |
|
Kasen IO
|
336b5e275b
|
Removed obsolete default scripts + more branding changes.
|
2020-01-12 23:13:01 -05:00 |
|
|
|
074e9f711a
|
Update Help menu links for Project Athena.
Changes links in the help menu to point to Project Athena sites. Removed menu option for Online Forums, cuz I don't think we have one yet.
|
2020-01-10 16:20:00 -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 |
|
NexPro
|
80e4e47cd8
|
updated TOS link. Changed incorrect filename in comment.
|
2020-01-09 10:20:28 +00:00 |
|
David Rowe
|
d79c87b2d4
|
Change Avatar Package docs links
|
2020-01-05 16:59:51 +13:00 |
|
David Rowe
|
934311b54a
|
Change default Avatar Packager project directory
|
2020-01-05 16:15:04 +13:00 |
|
David Rowe
|
7364ac5521
|
Fix scaled avatar walk speed
|
2020-01-04 11:43:28 +13:00 |
|
kasenvr
|
1d14bed3ce
|
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
QML Whitelisting
|
2019-12-30 19:51:51 -05:00 |
|
kasenvr
|
9dc7f54bfd
|
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
|
2019-12-29 18:28:58 -05:00 |
|
Kasen IO
|
7489505f99
|
Updated whitelist info and name to include QML.
|
2019-12-26 22:27:58 -05:00 |
|
Nex-Pro
|
4856dd07fc
|
Update interface window title
Change window title from "High Fidelity" to "Project Athena"
|
2019-12-25 00:20:36 +00:00 |
|
David Rowe
|
00bd81b8c3
|
using MyAvatar.getTargetAvatar or AvatarList.getAvatar.
|
2019-12-24 09:52:19 +13:00 |
|
David Rowe
|
2dd981493e
|
Update classes' JSDoc per @hideconstructor
|
2019-12-23 14:13:48 +13:00 |
|
Kasen IO
|
c34cd996df
|
change Metaverse API from setting
|
2019-12-20 11:39:05 +01:00 |
|
David Rowe
|
a04e57d82d
|
Miscellaneous JSDoc fixes noticed in passing
|
2019-12-19 11:38:17 +13:00 |
|
David Rowe
|
e13b237e96
|
Add missing Controller.Hardware.Application camera properties' JSDoc
|
2019-12-19 11:23:36 +13:00 |
|
David Rowe
|
c52fa7a376
|
Fix up InteractiveWindow JSDoc per recent changes
|
2019-12-19 10:30:40 +13:00 |
|
Fluffy Jenkins
|
0f3e8d2101
|
Made requested changes
|
2019-12-18 20:08:20 +00:00 |
|
David Rowe
|
ccc4be5312
|
Revise extended avatar blend shapes JSDoc
|
2019-12-18 12:54:56 +13:00 |
|
David Rowe
|
a6b4bc5872
|
Revise recent Picks.PICK_BYPASS_IGNORE JSDoc
|
2019-12-18 12:30:50 +13:00 |
|
David Rowe
|
9d67b4aff2
|
Fix up MyAvatar JSDoc on sitting property and methods
|
2019-12-18 10:02:03 +13:00 |
|
David Rowe
|
427aa851b3
|
Fix up links to avatar standards guide
|
2019-12-18 09:51:34 +13:00 |
|
David Rowe
|
13a8ede1ac
|
Fix up MyAvatar reaction methods' JSDoc
|
2019-12-18 09:19:26 +13:00 |
|
David Rowe
|
28f5046ab2
|
Fix MyAvatar.gotoLocation()'s "withSafeLanding" parameter JSDoc
|
2019-12-18 08:31:57 +13:00 |
|
David Rowe
|
34958ddb71
|
Address some JSDoc issues identified by makitsune
|
2019-12-18 08:01:20 +13:00 |
|
