Commit graph

85581 commits

Author SHA1 Message Date
bf48bf01c6
Merge branch 'vircadia:master' into tell-accountmanager-url-changed 2022-01-18 21:36:50 +01:00
4e399edaa7 Merge remote-tracking branch 'origin/master' into remove-hifiac 2022-01-18 21:29:33 +01:00
namark
d70ee1889d Fixed most linux distros unconditionally deemed too old to be Qt. 2022-01-18 22:54:41 +04:00
Dale Glass
309e2b0eaa Review fixes 2022-01-16 23:05:14 +01:00
Dale Glass
598032b734 Review fixes 2022-01-16 21:38:14 +01:00
Dale Glass
6738624bff Two more conversions to Utf8 2022-01-16 21:38:14 +01:00
Dale Glass
0c453e7e0e Explicitly encode QStrings to utf8 2022-01-16 21:38:14 +01:00
Kalila
4394c2e00b
Merge pull request #1567 from daleglass/fix-qhash
Fix MultiHash issues added in PR #1468.
2022-01-15 15:24:19 -05:00
dependabot[bot]
688d01279c
Bump follow-redirects from 1.12.1 to 1.14.7 in /scripts/system/inventory
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.12.1 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.12.1...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-15 19:45:54 +00:00
dependabot[bot]
9872a69afa
Bump shelljs from 0.8.4 to 0.8.5 in /scripts/system/inventory
Bumps [shelljs](https://github.com/shelljs/shelljs) from 0.8.4 to 0.8.5.
- [Release notes](https://github.com/shelljs/shelljs/releases)
- [Changelog](https://github.com/shelljs/shelljs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shelljs/shelljs/compare/v0.8.4...v0.8.5)

---
updated-dependencies:
- dependency-name: shelljs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-15 07:23:56 +00:00
Dale Glass
5f7bd24c14 Fix MultiHash issues 2022-01-13 23:02:46 +01:00
Kalila L
262a071b48 Update README.md 2022-01-13 05:39:04 -05:00
Kalila
02727fc93a
Update BUILD_LINUX.md 2022-01-06 17:48:50 -05:00
Kalila
19adf81c16
Apply suggestions from code review
Co-authored-by: Julian Groß  <julian.g@posteo.de>
2022-01-06 17:17:46 -05:00
Kalila
604b6c0b2b
Update BUILD_LINUX.md
Remove Ubuntu 16.04 references.
2022-01-06 17:17:19 -05:00
Frost
d2f0583a36 Remove duplicate setAuthURL declaration 2022-01-06 11:23:05 -08:00
Frost
d2f878000e Tell the AccountManager that the auth URL changed 2022-01-06 11:23:04 -08:00
Frost
3d0c5e26b7 Fix some anchors and add logging 2022-01-06 11:22:50 -08:00
Frost
b5258ead80 Fix height, tabbing, and other stuff 2022-01-06 11:22:50 -08:00
Frost
5a09064f50 Add metaverse server field on the login screen 2022-01-06 11:22:50 -08:00
Kalila
44520dacd6
Merge pull request #1556 from JulianGro/fix_static_function_warning
Fix static function warning in SocketType.h.
2022-01-05 21:25:43 -05:00
Kalila
9b71706ed0
Merge pull request #1562 from scrblue/1557-debug
Mirror NSIS fix for PR builds to master builds on GHA.
2022-01-05 18:58:37 -05:00
Daniel Lyne
982d344aa8 Mirror NSIS fix for PR builds to master builds 2022-01-05 05:28:33 -05:00
Kalila
72b25b7f72
Merge pull request #1560 from scrblue/1557-debug
Resolve #1557 where Windows builds fail on GHA due to incompatible NSIS version.
2022-01-05 03:05:49 -05:00
Kalila
990cb7f52e
Update pr_build.yml
Move to one line.
2022-01-04 02:21:35 -05:00
Daniel Lyne
3679fd8a6a Attempt installation of previous versions of NSIS 2022-01-03 19:25:04 -05:00
Julian Groß
cd1798a3d3 Fix static function warning 2021-12-31 01:01:35 +01:00
Kalila
fa2b1ea396
Merge pull request #1554 from JulianGro/linuxmint19_build
Choose right Qt version for Linux Mint 19.x
2021-12-30 17:05:12 -05:00
Dale Glass
9df0f109fa
Merge pull request #1553 from ksuprynowicz/loadSpirvResource_fix
Fixed memcpy in loadSpirvResource
2021-12-26 20:37:09 +01:00
Dale Glass
d7073597e4
Merge pull request #1552 from ksuprynowicz/gltf_metallic_fix
Fixed metallic material import for glTF.
2021-12-26 20:34:01 +01:00
Dale Glass
08407b9736
Merge pull request #1547 from JulianGro/macOS_revert_deadlock
Remove extended deadlock wait on macOS
2021-12-26 20:27:36 +01:00
Dale Glass
574b5ae617
Merge pull request #1546 from JulianGro/macOS_Qt5.15.2_build_readme
Update qt-builder readme for macOS
2021-12-26 20:25:36 +01:00
Dale Glass
d022b004f4
Merge pull request #1482 from daleglass/qt5-fix-vector
Replace the deprecated QVector::fromStdVector and QVector::toStdVector().
2021-12-26 20:23:43 +01:00
Julian Groß
4e5e8788d5 choose right Qt version for Linux Mint 19.x 2021-12-25 23:49:49 +01:00
2ef47b0bed Fixed memcpy in loadSpirvResource 2021-12-25 18:25:13 +01:00
Kalila
0026abaa17
Merge pull request #1545 from ksuprynowicz/gltf_crash_fix2
Update loops to prevent crash on some GLTF models.
2021-12-23 17:13:27 -05:00
Dale Glass
8d8d43e342 Review fix 2021-12-23 23:10:44 +01:00
Dale Glass
aeb52b38c7 Replace the deprecated toStdVector() and fromStdVector() 2021-12-23 23:10:44 +01:00
9a3686ccb6 Fixed metallic material import for GLTF 2021-12-23 19:40:50 +01:00
Kalila
528020417a
Merge pull request #1528 from JulianGro/macOS_SDK_checksum
GHA: Add checksum for macOS SDK for PR and master builds.
2021-12-21 12:37:53 -05:00
Julian Groß
3bc9846ebf Merge remote-tracking branch 'refs/remotes/vircadia/master'
Conflicts:
	.github/workflows/pr_build.yml
2021-12-21 12:52:52 +01:00
Julian Groß
683231818f Add checksum check to master builds as well 2021-12-21 11:57:43 +01:00
Julian Groß
dd4286c6d3 Add checksum for macOS SDK 2021-12-21 11:57:42 +01:00
Kalila
ae47efdd42
Merge pull request #1548 from vircadia/fix/macOS-sdk-link
Fix macOS SDK links in GHA.
2021-12-21 02:12:46 -05:00
Kalila
c0cba62e9e
Update master_build.yml 2021-12-21 00:16:17 -05:00
Kalila
02f44cb18f
Update pr_build.yml 2021-12-20 18:03:57 -05:00
a7883fc588
Update libraries/model-serializers/src/GLTFSerializer.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-12-20 18:49:25 +01:00
7106482c58
Update libraries/model-serializers/src/GLTFSerializer.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-12-20 18:49:13 +01:00
Julian Groß
05e8a4fd5c Update qt-builder readme with additional info 2021-12-20 01:58:37 +01:00
9a3a22d310 Changes to for loops needed to prevent crash on some GLTF models 2021-12-20 00:57:37 +01:00