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
Brad Davis
697f445edd
Merge remote-tracking branch 'upstream/master' into ga/master_build
2019-12-04 08:44:12 -08:00
Brad Davis
8844620116
Change s3 key prefix
2019-12-03 12:06:51 -08:00
Brad Davis
f39088fb0b
Github Actions master builds
2019-12-03 10:56:04 -08:00
Simon Walton
c38fe5b2aa
Another dummy statement
2019-12-01 23:25:14 -08:00
Simon Walton
0d52462578
Dummy Dockerfile statement
2019-11-30 00:18:25 -08:00
Simon Walton
c88479610d
Use correct path for hifi.conf; copy DS resources to image
2019-11-27 15:19:22 -08:00
jennaingersoll
c9bdd54b1d
Merge pull request #16541 from ctrlaltdavid/DOC-233
...
DOC-233: MaterialCache JSDoc
2019-11-27 14:56:42 -08:00
Simon Walton
35fe7fe00c
Build from updated base docker image; copy over supervisor hifi.conf
2019-11-27 12:25:18 -08:00
Anthony J. Thibault
764b6a9adf
code review feedback
2019-11-26 10:52:21 -08:00
David Rowe
fafb3dd30b
MaterialCache JSDoc
2019-11-26 17:43:23 +13:00
Simon Walton
30f3525932
Merge branch 'master' into linux-actions-builds
2019-11-22 18:02:48 -08:00
Anthony J. Thibault
320095f765
Added animedit avatar-animation.json graph editor tool
2019-11-22 15:40:44 -08:00
Seth Alves
ea2c6b4dfb
fix linux build
2019-11-22 11:35:23 -08:00
Simon Walton
9e5c0a7afc
Copy quazip lib to build dir; built server-console
2019-11-21 15:02:08 -08:00
Simon Walton
51cf9fab8e
Take out .so copy
2019-11-20 23:51:21 -08:00
Simon Walton
27d3b493fa
Initial Linux GHA build
2019-11-20 16:15:39 -08:00
Maia Hansen
48cdbcf933
Merge pull request #16401 from jherico/github_actions
...
DEV-2773: GitHub actions initial work
2019-11-19 11:46:52 -08:00
Brad Davis
d4b3a9ba49
Github actions
2019-11-18 15:20:37 -08:00
sabrina-shanman
f39121c53b
Fix build error/warning
2019-11-12 09:52:58 -08:00
sabrina-shanman
7b14c00540
Merge branch 'master' into instancing
2019-11-05 10:22:24 -08:00
HifiExperiments
bae2ba7bae
merge with master
2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d
fix build error, add environment variable
2019-11-02 01:03:34 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
...
Merge master into instancing
2019-10-31 17:39:15 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
...
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Shannon Romano
8d6434fbca
Merge pull request #16367 from ctrlaltdavid/DOC-199
...
DOC-199: AudioScope JSDoc
2019-10-30 13:45:13 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master
...
Merge master into instancing
2019-10-30 09:16:04 -07:00
danteruiz
bc207638a5
Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher
2019-10-25 10:15:39 -07:00
danteruiz
58a3cf6e67
finishing qt-lite build info
2019-10-25 10:13:23 -07:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master
...
Merge master into instancing
2019-10-25 09:55:44 -07:00
HifiExperiments
1e100a672e
merge with master and try to fix opacity mode stuff
2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7
Merge branch 'master' into feature/arkit-blendshapes
2019-10-23 21:45:10 -07:00
danteruiz
850dcb839d
adding build qt-lite build rules
2019-10-23 14:39:34 -07:00
David Rowe
2591aed686
Exclude AudioScope API from JSDoc output
2019-10-24 09:20:24 +13:00
danteruiz
1d3be46068
Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher
2019-10-23 10:17:46 -07:00
Bradley Austin Davis
6cb1421978
Qt patch for mac video
2019-10-21 16:09:48 -07:00
Sam Gateau
695b9cdba6
Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform
2019-10-18 03:31:06 -07:00
Anthony J. Thibault
da0911e01b
Delete legacy blendshape code
...
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -07:00
dante ruiz
7474f3f721
add qt-lite-mac-config.opt
2019-10-15 16:27:14 -07:00
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master
...
Merge master into instancing
2019-10-09 16:59:54 -07:00
Shannon Romano
a52b8acf4d
Merge pull request #16306 from huffman/feat/hq-launcher-serverless
...
DEV-2374: Add serverless content back to launcher builds
2019-10-09 16:15:58 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111
...
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
2019-10-08 10:01:21 -07:00
David Rowe
f224832d27
Merge branch 'master' into DOC-111
2019-10-08 20:44:13 +13:00
Ryan Huffman
bab1a902a5
Add serverless content back to launcher builds
2019-10-07 15:44:57 -07:00
Brad Davis
b2bcf54b5b
Removing frame converter
2019-10-04 19:52:55 -07:00
Brad Davis
243120b95c
Even better frame capture
2019-10-04 14:57:39 -07:00
Brad Davis
88514540d1
Fixing tools build
2019-10-04 09:26:33 -07:00
Brad Davis
cc1be64850
Fixing build issues
2019-10-04 09:20:02 -07:00
Brad Davis
3c6e98f16b
New format for captured GPU frames
2019-10-04 08:34:06 -07:00
danteruiz
97644eb335
Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher
2019-10-02 16:44:00 -07:00
Sam Gateau
1d19671e88
Merge branch 'master' of github.com:highfidelity/hifi into instancing
2019-10-01 11:27:16 -07:00
