Commit graph

1645 commits

Author SHA1 Message Date
Kalila L
90a7c6cdac Merge branch 'master' into gha-master-ci 2020-10-29 17:32:53 -04:00
Dale Glass
7b6fbe1f69 Set OpenGL_GL_PREFERENCE to LEGACY
GLVND appears to break the entire UI on ATI video cards.

It was set to GLVND due to an understanding that this was a no-op setting, but it turns
out the documentation in OpenGL_GL_PREFERENCE is confusing, and it looks like LEGACY
is the setting that was being used after all.

An additional point of interest is that debian/rules contained OpenGL_GL_PREFERENCE=GLVND,
and this was done back in the High Fidelity days. It's uncertain whether this was correct
or not, though.
2020-10-13 20:13:45 +02:00
kasenvr
76093185b7
Merge pull request #763 from daleglass/fix-opengl-cmake-warning
Set GL preference to GLVND
2020-10-08 19:03:34 -04:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs 2020-10-02 15:33:28 -04:00
Dale Glass
1c44bc96d9 Set GL preference to GLVND
This should be a no-op, besides generating less build warnings,
since:

"CMake 3.11 and above prefer to choose GLVND libraries."

And 3.11 is a few years old at this point
2020-09-27 20:37:12 +02:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
9a35323295 Update entities API docs to show entity properties at top. 2020-09-18 16:27:42 -04:00
David Rowe
2ed37d0c47 Fix upload target location and path 2020-09-17 09:02:00 +12:00
David Rowe
9395caa7d0 Rework GitHub Actions builds for merges to master 2020-09-17 09:01:27 +12:00
Julian Groß
dce34b8d90 Change strings, comments and folders to Vircadia 2020-07-09 16:03:07 +02:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
Dale Glass
407b2a4f22 Remove all uses of QString::null
It's deprecated and produces a warning on Qt 5.14
2020-05-17 18:00:02 +02:00
Thijs Wenker
8a76753135 Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia 2020-05-07 11:07:28 +02:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core
Update master with kasen/core's latest changes
2020-04-25 14:46:01 -04:00
Thijs Wenker
0ebe33b447 change upload server 2020-04-19 22:50:52 +02:00
Thijs Wenker
25932d3ab5 the new build upload script 2020-04-19 22:50:51 +02:00
kasenvr
0acf959fb6
Apply suggestions from code review
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-04-10 17:13:24 -04: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
Kasen IO
0588fd3f4f API docs rebranded to Vircadia. 2020-04-07 02:11:29 -04:00
Kasen IO
fff819f56c Fix sidebar not showing on first load. 2020-03-27 16:07:59 -04:00
David Rowe
1112367b06 Handle localStorage not being available 2020-02-02 20:57:56 +13:00
Kasen IO
eaa6151ff3 == to === 2020-01-31 13:53:46 -05:00
Kasen IO
d8ba64785f Fix tabs 2020-01-31 13:24:24 -05:00
Kasen IO
0eac20d830 toggle works + viewport restriction removed. 2020-01-30 13:12:46 -05:00
Kasen IO
a8000f876b menu show/hide button added. 2020-01-30 12:17:09 -05:00
Kasen IO
d3e2f7204b init 2020-01-30 11:30:31 -05:00
Kasen IO
b10ffc667f remove non codeblock bg for code, add weight to all for visibility. 2020-01-24 10:42:46 -05:00
Kasen IO
6ec6b39530 code comments brighter, code blocks now have padding for readability. 2020-01-24 10:14:55 -05:00
Kasen IO
4f56a847d7 Bugfix for init val. 2020-01-24 08:16:13 -05:00
Kasen IO
2eca2cf10e Theme + button bg matches sidebar. 2020-01-23 22:52:34 -05:00
Kasen IO
d373826d03 Fixed theme selection loading bug. 2020-01-23 18:37:15 -05:00
Kasen IO
717c20fc84 Fixed persistence bug. 2020-01-23 16:04:31 -05:00
Kasen IO
615c01d058 Disabled dev mode on Vue, fixed persistence, updated styles. 2020-01-23 15:52:22 -05:00
Kasen IO
3c1665df02 Updated some colors. 2020-01-23 13:54:01 -05:00
Kasen IO
53d05f9fee Night mode set to default + toggle implemented. 2020-01-23 13:47:59 -05:00
Kasen IO
78bf9e9a2f Vue.JS + Vuetify init + test. 2020-01-23 02:55:50 -05:00
6ac090dea5 Quick fix for the metaverse API
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
2020-01-14 20:33:39 -06:00
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0
fix linux build
2020-01-14 18:44:01 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
David Rowe
195f8867d8 Disable API docs old analytics 2020-01-14 12:48:16 +13:00
David Rowe
60e2c2b520 API docs rebranding 2020-01-09 10:38:58 +13:00
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
David Rowe
f7336d9141 Fix @hideconstructor JSDoc tag hiding classes' properties 2019-12-23 14:12:50 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
42b69332f7
Merge pull request #16564 from ctrlaltdavid/DOC-239
DOC-239: Rates JSDoc
2019-12-13 10:36:39 -08:00
Brad Davis
1ac7215ac8 Fix GA S3 upload path 2019-12-10 12:44:49 -08:00
David Rowe
73ad5d1d31 Fix some JSDoc typos noticed in passing 2019-12-10 13:34:32 +13: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