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
|
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 |
|
|
|
997abf6543
|
Remove logging statement.
|
2020-01-19 15:40:23 -06:00 |
|
|
|
cb78daa0b1
|
Delete trailing whitespace.
|
2020-01-16 14:34:08 -06:00 |
|
|
|
26d507c39a
|
Yet more style fixes.
|
2020-01-16 11:30:45 -06:00 |
|
|
|
fef469cca4
|
More style fixes for the Great and Powerful Thoys
|
2020-01-15 18:00:27 -06:00 |
|
|
|
f93e47cfcd
|
Merge branch 'opus-plugin' of https://github.com/MarcusLlewellyn/project-athena into opus-plugin
|
2020-01-15 13:51:12 -06:00 |
|
|
|
9a67ee19e0
|
More review fixes since I missed 66 of them.
|
2020-01-15 13:49:25 -06:00 |
|
|
|
d96da21dd7
|
Update plugins/opusCodec/src/OpusDecoder.cpp
Co-Authored-By: Thijs Wenker <me@thoys.nl>
|
2020-01-15 13:06:42 -06:00 |
|
|
|
0a3dfdefce
|
Update plugins/opusCodec/src/plugin.json
Co-Authored-By: Thijs Wenker <me@thoys.nl>
|
2020-01-15 13:05:43 -06:00 |
|
|
|
5ff8654363
|
Update plugins/opusCodec/src/plugin.json
Co-Authored-By: Thijs Wenker <me@thoys.nl>
|
2020-01-15 13:04:59 -06:00 |
|
|
|
24669c98f6
|
Made changes requested by reviewer
Fixed missing copyright headers.
Fixed exceeding 120 columns.
Fixed #include
Fixed if conditional style.
Fixed C++ reference symbol placement.
|
2020-01-15 12:57:18 -06:00 |
|
|
|
f23dfc7d0d
|
Cleanup some kruft.
Removed some unecessary files, defines, and includes.
|
2020-01-14 17:41:55 -06:00 |
|
Dale Glass
|
830f3ab337
|
Instrument HifiAC code with performance timers
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
|
2020-01-14 16:58:05 -06:00 |
|
HifiExperiments
|
c45ee33e97
|
review comment
|
2020-01-13 17:44:32 -08:00 |
|
|
|
6a294404c2
|
fix marcus being very stoopid
|
2020-01-13 15:44:46 -06:00 |
|
|
|
3a5059a613
|
Re-enable hifiAC and pcmCodec projects
These has been disabled for testing purpose. They are now restored.
|
2020-01-13 13:35:36 -06:00 |
|
|
|
0022170400
|
Fix minor cmake oopsie.
|
2020-01-12 18:33:46 -06:00 |
|
|
|
2b8c0ffbdc
|
Merge branch 'daleglass/opus-plugin' into opus-plugin
|
2020-01-12 18:18:14 -06:00 |
|
|
|
c9595016f8
|
DEBUG: Temp removal of hifiCodec and pcmCodec projects.
This is to ensure that no other codecs are being fallen back upon when testing the Opus codec.
|
2020-01-10 12:19:19 -06:00 |
|
|
|
32c438ffc2
|
Update CMakeLists.txt
Fix interface linking errors on Windows.
|
2020-01-10 12:17:53 -06:00 |
|
