Commit graph

675 commits

Author SHA1 Message Date
David Rowe
c33fb5df84 Fix cmake warning when bypassing signing 2020-10-18 16:35:17 +13:00
David Rowe
5f283e45b5 Fix use of the BYPASS_SIGNING flag 2020-10-18 15:55:59 +13:00
Kalila L
5e43b3a550 Fix sandbox and console names on PR builds. 2020-10-02 20:52:03 -04:00
Kalila L
aa20fbb0d9 Fix double application of "Vircadia" 2020-10-02 16:48:54 -04:00
Kalila L
11d847b74b Merge branch 'master' into feature/update-shortcut-names 2020-10-02 15:24:18 -04:00
Kalila L
bb3ea1014a Update shortcut names to include "Vircadia" 2020-08-24 23:47:36 -04:00
Kalila L
a2bd06993f Add option to build an Interface to go to specified address by default. 2020-08-23 01:49:32 -04:00
Kasen IO
cefda3f7f2 Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
Thijs Wenker
eb1bf12494 Fix linux PR builds 2020-05-18 14:07:38 +02:00
Thijs Wenker
48ee437c00 cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release 2020-04-19 22:50:49 +02:00
David Rowe
1254557814 Fix Linux cmake problem
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:24:35 +12:00
David Rowe
b92bd1773a Fix copying PolyVox libraries to cmake binary directory 2020-04-11 20:24:10 +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
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin
Add support for the Opus audio plugin.
2020-01-31 01:04:47 +01:00
a0fd53ae24 Change installer name from Beta to Alpha 2020-01-17 14:58:40 -06:00
Thijs Wenker
26bebba8dd fix opus library linking in cmake
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-13 12:27:24 -06:00
d030d82355 Cosmetic change for TargetOpus.cmake 2020-01-10 12:17:22 -06:00
3d8d359c35 Initial work on Opus audio plugin
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
2020-01-09 16:43:11 +01:00
986cb05f7b
Fix typo
Tomato, Tohmahto, Athena, Athenay
2019-12-29 17:40:51 -06:00
f614f6f290 Stuff I forgot in last commit for NSIS 2019-12-22 15:44:25 -06:00
Simon Walton
16b6c6305b Fix formatting issues in cmake file 2019-12-10 09:46:35 -08:00
Simon Walton
82ed358323 Merge remote-tracking branch 'upstream/master' into linux-actions-builds
Also merge in Linux PR build
2019-12-05 16:19:12 -08:00
Brad Davis
f39088fb0b Github Actions master builds 2019-12-03 10:56:04 -08:00
Brad Davis
0240a6e3d9 Update prebuilt dependencies 2019-11-25 11:42:09 -08:00
Simon Walton
167dfab539 Copy PolyVox libs to build directory; don't try to upload docker image 2019-11-22 15:17:23 -08:00
Simon Walton
9e5c0a7afc Copy quazip lib to build dir; built server-console 2019-11-21 15:02:08 -08:00
Anthony J. Thibault
befbdcef48 Upgraded OSC plugin with changes from ARKit blendshape work. 2019-11-19 13:13:56 -08:00
Brad Davis
d4b3a9ba49 Github actions 2019-11-18 15:20:37 -08:00
Zach Fox
1e24df3f71 Get Interface to look in the proper directories 2019-10-31 08:57:06 -07:00
milad
ea373ac14c First steps towards a screenshare app 2019-10-30 16:44:42 -07:00
Ken Cooke
97dab24a69 Fix Android clang warnings due to unused compiler flags 2019-09-26 15:45:26 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
dante ruiz
f80fb39447 Lowercase interface
Launcher expects a lower-cased "Interface". This ensures that it's
created lower-cased on case sensitive filesystems.
2019-09-06 11:19:54 -07:00
Brad Davis
7c84d897ba Fix webrtc link errors in debug builds 2019-09-05 14:16:52 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
amerhifi
7a1828e0cb removed interface name from shortcut 2019-08-27 21:41:45 +02:00
Seth Alves
27b574cf14 disable webrtc for android 2019-07-30 14:09:34 -07:00
Seth Alves
c1cadf670e update webrtc library, enable for android 2019-07-30 14:09:31 -07:00
Seth Alves
32d5ab7b1f Make WebRTC library available 2019-07-30 14:09:30 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
humbletim
6ae75ecafe segregated scripting/ plugins (re: permissions checkbox) 2019-07-26 01:31:42 -04:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Matt
34908e54ef
Merge pull request #15873 from Atlante45/feat/qt-5.12.3-upgrade
BUGZ-820: Remove QT_CMAKE_PREFIX_PATH prod hack
2019-07-12 10:24:06 -07:00
SamGondelman
bda87aa13f trying to fix android 2019-07-11 16:39:23 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
SamGondelman
981311778c comments 2019-07-03 10:41:10 -07:00
Clement
c7442e3a62 Remove QT_CMAKE_PREFIX_PATH prod hack 2019-07-02 16:00:55 -07:00
SamGondelman
68d2f9581f add ability for slp files to define shader variants 2019-06-03 19:16:42 -07:00
Anthony Thibault
736d002f59 Apparently APPLE is UNIX in cmake. 2019-05-30 09:44:27 -07:00