MotoFufu9k
|
a710142871
|
Change "FILENAME_PATH_FORMAT" to "vircadia..."
|
2020-05-05 00:39:25 +02: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 |
|
David Rowe
|
1a4266a64a
|
Review JSDoc updates from recent commits
|
2020-01-20 14:33:06 +13:00 |
|
David Rowe
|
ec1e6bc7d3
|
Merge branch 'DOC-55-C' into api-docs
|
2020-01-14 18:04:32 +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
|
c52fa7a376
|
Fix up InteractiveWindow JSDoc per recent changes
|
2019-12-19 10:30:40 +13:00 |
|
David Rowe
|
93bcb43186
|
Stats API updates to match
|
2019-12-15 14:14:43 +13:00 |
|
Brad Hefta-Gaub
|
e7bb57622a
|
Merge pull request #16557 from ctrlaltdavid/DEV-2810
DEV-2810: Rename Stats.audioAudioInboundPPS to Stats.audioInboundPPS
|
2019-12-13 13:34:34 -08:00 |
|
Brad Hefta-Gaub
|
80572e7d02
|
Merge pull request #16570 from ctrlaltdavid/DOC-241
DOC-241: ContextOverlay JSDoc
|
2019-12-13 10:49:14 -08:00 |
|
David Rowe
|
57016ded11
|
Fix up some corresponding InteractiveWindow JSDoc
|
2019-12-13 10:13:22 +13:00 |
|
David Rowe
|
febbd3a802
|
ContextOverlay JSDoc
|
2019-12-11 15:05:20 +13:00 |
|
David Rowe
|
957c056764
|
Fix JSDoc typo noticed in passing
|
2019-12-07 08:29:52 +13:00 |
|
David Rowe
|
078c30b696
|
Add Stats.audioInboundPPS property and signal
And deprecate misnamed originals.
|
2019-12-07 08:28:53 +13:00 |
|
David Rowe
|
3ebceff428
|
Doc review
|
2019-11-28 12:42:35 +13:00 |
|
David Rowe
|
46c389f064
|
Tidying
|
2019-11-26 15:19:54 +13:00 |
|
David Rowe
|
d797e33123
|
Stats JSDoc
|
2019-11-26 13:39:00 +13:00 |
|
David Rowe
|
b458a746b7
|
Fix crash in Stats.forceUpdateStats() at start-up
|
2019-11-23 15:23:57 +13:00 |
|
Andrew Meadows
|
9d92546a8b
|
revert the revert of PR-16307
|
2019-11-14 09:59:43 -08:00 |
|
Sam Gateau
|
a4696992e8
|
Renaming the env variable to enable Material Proecural Shaders
|
2019-11-04 11:15:37 -08:00 |
|
HifiExperiments
|
bae2ba7bae
|
merge with master
|
2019-11-02 01:08:56 -07:00 |
|
Anthony Thibault
|
f99bb3ec77
|
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
Extended avatar blendshape support for ARKit compatiblity
|
2019-10-31 12:33:50 -07:00 |
|
Anthony J. Thibault
|
9325ea588a
|
Re-added removed jsdoc comments for removed AvatarInput jsapi.
With a comment that these properties/functions have been removed.
|
2019-10-26 09:20:51 -07:00 |
|
Shannon Romano
|
15f27e53cb
|
Merge pull request #16372 from ctrlaltdavid/DEV-2055
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
|
2019-10-24 15:20:34 -07:00 |
|
HifiExperiments
|
1e100a672e
|
merge with master and try to fix opacity mode stuff
|
2019-10-23 22:21:45 -07:00 |
|
Anthony J. Thibault
|
d43d12dfa7
|
Merge branch 'master' into feature/arkit-blendshapes
|
2019-10-23 21:45:10 -07:00 |
|
David Rowe
|
378c47d16c
|
Replace world detail quality float with enum
|
2019-10-22 19:18:11 +13:00 |
|
Zach Fox
|
4c48d80da7
|
Fix warning on MacOS and Ubuntu
|
2019-10-18 13:34:42 -07:00 |
|
Zach Fox
|
d65538a11b
|
DEV-2471: Fix an issue with InteractiveWindow anchors that caused windows without anchors to move when the Interface window geometry changes
|
2019-10-18 12:41:19 -07:00 |
|
Anthony J. Thibault
|
da0911e01b
|
Delete legacy blendshape code
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
|
2019-10-16 10:36:37 -07:00 |
|
Zach
|
e495dc7990
|
Fix crash on MacOS; don't do resizing in C++ anymore
|
2019-10-14 15:55:33 -07:00 |
|
Zach Fox
|
341abb8185
|
Merge branch 'master' of github.com:highfidelity/hifi into friction
|
2019-10-14 12:36:35 -07:00 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -07:00 |
|
Zach Fox
|
19acd76854
|
Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup
|
2019-10-10 15:48:40 -07:00 |
|
Maia Hansen
|
07b916f0b7
|
Merge pull request #16307 from AndrewMeadows/colossal-cave
DEV-1811: apply deletion rules to linked entities
|
2019-10-10 13:24:43 -07:00 |
|
Zach Fox
|
240f904b85
|
DEV-2386: Remove 'Run Client Script Test'
|
2019-10-10 11:11:27 -07:00 |
|
David Rowe
|
1106d8fdfa
|
Doc review
|
2019-10-08 21:15:16 +13:00 |
|
Andrew Meadows
|
8ab70225d9
|
apply delete rules down linked hierarchy
|
2019-10-07 14:38:36 -07:00 |
|
RebeccaStankus
|
978bcaffeb
|
Undo removal of User Inspection
|
2019-09-24 11:18:16 -07:00 |
|
RebeccaStankus
|
e41632e3ec
|
Removing connections to use inspect mode on mouse events
|
2019-09-23 14:42:13 -07:00 |
|
David Rowe
|
34883990b4
|
Clarify which line3d overlay properties aren't working
|
2019-09-20 10:19:02 +12:00 |
|
David Rowe
|
d5e08d19e3
|
Fix JSDoc for miscellaneous white space issues
|
2019-09-20 08:17:24 +12:00 |
|
David Rowe
|
dff37a71eb
|
Fix JSDoc markup HTML issues
|
2019-09-17 16:26:09 +12:00 |
|
Anthony J. Thibault
|
c35640f739
|
Warning fixes and small bug fix to anim stats
|
2019-09-05 14:54:19 -07:00 |
|
HifiExperiments
|
97b9179144
|
merge with master
|
2019-09-05 00:46:56 -07:00 |
|
Brad Davis
|
82a49d4641
|
Fix android build
|
2019-08-29 20:19:49 -07:00 |
|
Brad Davis
|
428a58710d
|
BUGZ-1365: Ensure that by default web views can't access local content
|
2019-08-29 13:44:49 -07:00 |
|
Brad Davis
|
954773124a
|
BUGZ-1363: crash when checking for web content restrictions
|
2019-08-28 09:56:45 -07:00 |
|
Zach Fox
|
dfcf70b9b5
|
Tons of Emote/Emoji changes
|
2019-08-23 14:14:53 -07:00 |
|