Commit graph

903 commits

Author SHA1 Message Date
Kalila L
f5485e858c Licensing headers. 2020-12-10 18:56:04 -05:00
humbletim
5c2a8bd459 changes per CR 2020-10-31 14:11:05 -04:00
humbletim
dedf6a6975 further cleanup per peer review (thanks fluffy!) 2020-10-28 22:24:29 -04:00
humbletim
7fb0173ef7 clarifications per peer review 2020-10-28 21:58:32 -04:00
humbletim
f54b1c5fed revamped modkit plugin example 2020-10-28 21:26:01 -04:00
humbletim
fa3a886ce2 rename plugin folder 2020-10-28 20:48:59 -04:00
Kalila L
96877db43a Re-apply 0dadb100b1 w/ authorship.
Co-Authored-By: Humbletim <humbletim@gmail.com>
2020-10-24 05:02:45 -04:00
Kalila L
0dadb100b1 Revert 0b46c53df1 2020-10-24 04:49:01 -04:00
Kalila L
b3ab7e05d3 Add missing authorship comment. 2020-10-24 04:20:02 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings
Fix warnings emitted by GCC
2020-09-24 17:06:16 -04:00
Dale Glass
eeb13fe17f Fix numerical precision warning 2020-08-27 19:27:11 +02:00
Dale Glass
3615ca70b1 Fix build of hifiSdl2 on GCC 10
GCC 10 and above sets -fno-common by default, and causes a linking problem here:
ultiple definition of `WAYLAND_wl_proxy_marshal'

Work around it per https://medium.com/@clentfort/using-esy-sdl2-with-gcc-10-91b4fa0c5aa9
2020-08-26 00:40:20 +02:00
David Rowe
989cd2d169 Fix Linux build error 2020-07-11 15:59:16 +12:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
David Rowe
6e1af6df73 Update copyright notices 2020-07-10 07:18:29 +12:00
David Rowe
96ae709720 Update copyrights 2020-07-06 20:40:55 +12:00
David Rowe
5e52812747 Prevent excessive logging of a SteamVR event on Linux 2020-07-06 20:01:28 +12:00
David Rowe
c2bb26e519 Typos etc. 2020-06-29 12:40:39 +12:00
David Rowe
24352a7189 Add JSDoc for Vive eyes and fingers controller properties 2020-06-29 11:32:05 +12:00
David Rowe
e2a7abe8a2 Remove unused code 2020-06-29 11:12:46 +12:00
David Rowe
cc73528d0b Make Vive PRO Eye code Windows-only 2020-06-29 11:12:22 +12:00
David Rowe
2e9a8e2b33 Add option to enable Vive PRO Eye eye tracking 2020-06-27 15:14:21 +12:00
David Rowe
e95dd3c2bd Fix Settings > Calibration dialog not functioning when HIFI_DEBUG_OPENVR 2020-06-27 12:32:57 +12:00
David Rowe
0f324ee9ae Merge branch 'v2020.2.2-rc' into feature/openvr-linux
# Conflicts:
#	plugins/openvr/CMakeLists.txt
#	plugins/openvr/src/ViveControllerManager.cpp
2020-06-19 16:27:53 +12:00
David Rowe
aaf9abdaef Add missing delete 2020-06-18 10:23:22 +12:00
David Rowe
ab4ff1e7aa Proper Linux command line parsing 2020-06-17 08:55:54 +12:00
David Rowe
350b5f217e Try removing Linux-specific argc, argv code 2020-06-16 10:02:19 +12:00
David Rowe
ec81ac8750 Merge branch 'master' into feature/openvr-linux 2020-06-16 08:30:29 +12:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes
Support blendshapes on model entities
2020-05-31 18:34:42 -04:00
David Rowe
ce96fc61d6 Remove unused code 2020-05-24 13:16:26 +12:00
David Rowe
1ac184bd22 Fix further type errors 2020-05-24 13:16:15 +12:00
David Rowe
6981937697 Fix path to header file 2020-05-23 20:42:22 +12:00
David Rowe
343c6a4027 Fix Linux targeting 2020-05-23 19:46:26 +12:00
David Rowe
33a77a5dbd Fix further Linux errors 2020-05-23 19:08:16 +12:00
David Rowe
f2232b89f0 Address Linux build warnings and errors 2020-05-23 17:18:03 +12:00
David Rowe
74f50ce079 Fix Linux build error 2020-05-23 15:48:48 +12:00
David Rowe
b72d5bf80c Build OpenVR plugin on Linux 2020-05-23 14:53:43 +12:00
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
David Rowe
c0e36b7960 Address code review comments 2020-05-16 14:37:40 +12:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
David Rowe
be8d97cbf7 Use new audio setting API values 2020-05-07 16:05:49 +12:00
David Rowe
f83ea58a10 Fix erroneous hard-coded audio setting string 2020-05-07 15:42:30 +12:00
David Rowe
da2aefb6b2 There are no longer so-called "high quality" overlays 2020-05-04 21:04:17 +12:00
Seth Alves
cb83e4e6c9 adjust to new eye matrix 2020-04-26 12:25:19 -07:00
Seth Alves
67f4811c2b blink actions were renamed 2020-04-26 12:24:47 -07:00
Seth Alves
a0031c6f10 eye and hand tracking for htc vive pro 2020-04-26 12:24:45 -07:00
Seth Alves
4d3da24c33 fix angularVelocity reported by leap-motion plugin 2020-04-26 12:22:53 -07: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
HifiExperiments
c062cb75ae Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-03 14:35:21 -07:00