Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 14:32:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
85361 commits 67 branches 56 tags 1.2 GiB
Commit graph

85361 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dale Glass
5f7bd24c14 Fix MultiHash issues 2022-01-13 23:02:46 +01: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
ksuprynowicz
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
ksuprynowicz
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
ksuprynowicz
a7883fc588
Update libraries/model-serializers/src/GLTFSerializer.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-12-20 18:49:25 +01:00
ksuprynowicz
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
ksuprynowicz
9a3a22d310 Changes to for loops needed to prevent crash on some GLTF models 2021-12-20 00:57:37 +01:00
Dale Glass
4641652899
Merge pull request #1523 from AleziaKurdis/CreateApp_BUGFIX-1517 
Create App: Prevent locked entities and their children from being duplicated.
 2021-12-18 20:27:36 +01:00
Dale Glass
293af1aea8
Merge pull request #1519 from AleziaKurdis/CreateApp-Bundle_December_2021 
Create App - "Add All Zones" on renderWithZones selector.
 2021-12-18 20:27:14 +01:00
Dale Glass
ab334405a8
Merge pull request #1533 from AleziaKurdis/ExploreApp-used-placename-to-connect 
Explore App: Use the placename instead of address (ip:port).
 2021-12-18 20:26:08 +01:00
Kalila
1c11dfc664
Merge pull request #1527 from ctrlaltdavid/dev/remove-submodule 
Remove Vircadia Web app submodule and add automatic detection instead.
 2021-12-16 17:37:41 -05:00
Julian Groß
650c2568cf Remove extended deadlock wait on macOS 2021-12-15 00:40:52 +01:00
Alezia Kurdis
c6041712b7
Use the placename instead of address (ip) 
Simple change that is using the placename instead of the "address" feild from the place api to build the url to connect.
For those where the placename = the domain name, Interface will be able to resolve path correctly.
using the address, this makes interface using 100% of the time the ip:/port information.
 2021-12-12 13:31:36 -05:00
Dale Glass
d4a832a0c1
Merge pull request #1473 from Penguin-Guru/AudioOutputTest 
Remove second argument from some playSystemSound() calls in QML.
 2021-12-11 20:58:54 +01:00
Dale Glass
93e5f48951
Merge pull request #1423 from Penguin-Guru/RenderingEffects 
Separate rendering effect settings.
 2021-12-11 20:51:34 +01:00
Kalila
e4fbe5d24f
Merge pull request #1526 from JulianGro/gha_dont_optimize_aarch64 
GHA: Disable compiler optimization on self-hosted runner.
 2021-12-11 14:46:38 -05:00
Kalila
03b5b83b67
Merge pull request #1339 from odysseus654/pr/make_shared 
Housekeeping: use of std::make_shared / QSharedPointer::create.
 2021-12-09 17:14:04 -05:00
Kalila
a1d0f95535
Merge pull request #1340 from odysseus654/pr/auto-const-ref 
Housekeeping: Update use of "auto" with plugin lists.
 2021-12-09 17:13:55 -05:00
Kalila
7610f810ef
Merge pull request #1474 from Penguin-Guru/CodeSimplification 
Remove <thread> library from main.cpp.
 2021-12-09 17:07:30 -05:00
David Rowe
5b82d7792f Include Web app and SDK files in solution only if present 2021-12-10 08:26:39 +13:00
David Rowe
9a048c643a Don't have the Web app as a submodule 2021-12-10 08:12:28 +13:00
Julian Groß
65ffa2745e Disable optimization on self hosted runner. 2021-12-09 19:00:40 +01:00
Alezia Kurdis
92f7997603
Fix for Issue #1517 
Fix for Issue #1517
Locked entities were simply ignored and it was still processing their children.
Now it's no more possible to duplicate if the selection and their children contains a locked entities.
It was also unable to add the new parent if the duplicated child entity was locked. Which was causing some other issues.
 2021-12-08 23:01:21 -05:00