overte/scripts/system
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
..
+android_interface
assets Merge branch 'master' of github.com:highfidelity/hifi into create 2019-06-25 09:28:43 -07:00
commerce ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
controllers Resurrect gamepad Y teleport button 2019-12-08 12:38:48 +13:00
create Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
html Merge branch 'master' of github.com:highfidelity/hifi into create 2019-06-25 09:28:43 -07:00
keyboardShortcuts remembered that macs exist 2019-07-12 12:39:58 -07:00
libraries Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
marketplaces Fixed bad path to gridControls 2019-06-25 16:31:21 -07:00
more Undo var -> const in more.html because it doesn't work, because reasons. 2020-03-16 00:39:29 -04:00
tablet-ui Swap flying binding to other hand. 2019-03-21 17:05:20 -07:00
attachedEntitiesManager.js
audio.js showing ptt text always + hmd mode switch fix 2019-03-25 17:32:03 -07:00
audioMuteOverlay.js moving text position higher 2019-03-29 10:41:16 -07:00
audioScope.js
avatarapp.js cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open 2019-03-27 10:12:58 -07:00
avatarFinderBeacon.js
away.js Put away animation into resource and update script to use local resource path. 2019-11-21 14:50:05 -08:00
bubble.js staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00
chat.js fix chat.js textSize 2019-02-28 15:28:18 -08:00
clickToAvatarApp.js Whitespace changes per code review 2019-07-22 10:36:57 -07:00
dialTone.js
directory.js
emote.js
fingerPaint.js
firstPersonHMD.js Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
generalSettings.js
goto.js
help.js
hmd.js remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
inspect.js Fix inspect not working after change camera mode 2020-01-14 11:34:16 +13:00
interstitialPage.js Remove the BodyMart tip from the interstitial page 2019-11-19 10:33:30 +13:00
makeUserConnection.js
menu.js
miniTablet.js Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
mod.js
nameTag.js
notifications.js remove white-space 2019-03-15 10:47:48 -07:00
pal.js Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
progress.js
quickGoto.js
redirectOverlays.js
request-service.js
run.js
snapshot.js fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
tablet-goto.js Relabel "GOTO" app's button to "OLD GOTO" 2020-03-29 13:34:26 +13:00
tablet-users.js
voxels.js