David Rowe
|
c3b7d65617
|
Merge branch 'master' into feature/qt-update-master
# Conflicts:
# BUILD.md
|
2021-03-25 10:18:38 +13:00 |
|
Kalila
|
6c223be3f4
|
Merge pull request #1081 from digisomni/feature/pkg-updates
Rename to "Vircadia Server" and disable server shortcuts with Express install on Windows
|
2021-03-14 17:35:03 -04:00 |
|
Kalila L
|
b5d89c44bf
|
Rename "INITIAL_STARTUP_LOCATION" -> "PRELOADED_STARTUP_LOCATION".
|
2021-03-08 02:01:53 -05:00 |
|
Kalila L
|
3ed98d0f3e
|
Add "ScriptGatekeeper" class and "PRELOADED_SCRIPT_WHITELIST" variable.
|
2021-03-08 02:00:34 -05:00 |
|
Kalila
|
fe3f006953
|
Update SetPackagingParameters.cmake
Try to fix Apple builds.
|
2021-03-08 00:14:50 -05:00 |
|
Kalila L
|
6ad9113bcc
|
Rename "Vircadia Sandbox" -> "Vircadia Server"
|
2021-03-07 20:57:04 -05:00 |
|
Kalila L
|
357aa9a08b
|
Update GenerateInstallers.cmake
Add release name to end of installers.
|
2021-02-22 23:28:27 -05:00 |
|
David Rowe
|
f69e0402aa
|
Merge branch 'master' into feature/qt-update-master
# Conflicts:
# BUILD.md
# BUILD_WIN.md
|
2021-02-23 16:08:55 +13:00 |
|
Kalila L
|
2287aba7fa
|
Update installer names and images "Alpha" -> ""
|
2021-02-01 05:10:45 -05:00 |
|
Kalila L
|
a0747b2912
|
Add "RELEASE_NAME" env variable.
|
2021-01-20 01:17:45 -05:00 |
|
David Rowe
|
d5530f180b
|
Update Windows builds to Qt 5.15.2
|
2020-12-28 15:54:38 +13:00 |
|
David Rowe
|
71cee734ec
|
Merge branch 'master' into fix/interface-console
# Conflicts:
# README.md
|
2020-12-18 19:44:20 +13:00 |
|
David Rowe
|
fd1ea3cf04
|
Update Windows builds to OpenSSL 1.1.1h
|
2020-12-18 10:05:21 +13:00 |
|
ArcadeFever
|
65fb1320cc
|
Upgraded Oculus SDKs to latest
|
2020-12-15 00:04:59 -08:00 |
|
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 |
|
