Commit graph

84798 commits

Author SHA1 Message Date
Julian Groß
883e12cb80 Fix non-consecutive header level increases 2021-05-02 10:52:08 +02:00
Kalila
cb3a0b51fe
Merge pull request #1183 from ctrlaltdavid/feature/rpm-blendshapes
ReadyPlayerMe blendshapes support
2021-05-01 14:24:30 -04:00
Kalila
a3626c83f4
Merge pull request #692 from odysseus654/pr/move-connect-packet-type
The domain server should see Packet ID=1 as a (broken) attempt to connect to the domain server
2021-04-29 18:39:25 -04:00
David Rowe
58a6ac384e Replace some QMap occurrences with QHash 2021-04-29 08:15:37 +12:00
David Rowe
d1136c2d3e Merge branch 'master' into feature/rpm-blendshapes 2021-04-27 21:32:35 +12:00
Kalila
73acf299f8
Merge pull request #1188 from daleglass/fix_nitpick
Link to pthread last
2021-04-26 06:24:21 -04:00
Kalila
80e17a1e94
Merge pull request #1193 from glenalec/patch-1
Update Snapshot.cpp
2021-04-26 03:51:07 -04:00
Kalila
3629427cff
Merge pull request #1161 from ctrlaltdavid/fix/spinbox
Fix settings (QML) spin box stepping
2021-04-26 03:39:56 -04:00
Heather Anderson
51f4320911 renamed StunResponse packet type 2021-04-25 18:37:34 -07:00
Heather Anderson
9f5e06503a begin identifying Packet Type ID=1 as "domain connect" for a future version of the protocol, so we can detect protocol breaks when we shift to using this as our domain connect packet. 2021-04-24 23:28:53 -07:00
daleglass
c7e79a5e3e
Merge pull request #1181 from ctrlaltdavid/fix/gltf-colors
Fix glTF mesh colors
2021-04-24 20:24:26 +02:00
David Rowe
24ddbc0d56 Update ReadyPlayerMe default mapping 2021-04-24 09:10:32 +12:00
David Rowe
e9fa76ae6e Fix conditional application 2021-04-24 08:49:57 +12:00
Glenn Alexander
307005d561
Update Snapshot.cpp
Changed string "highfidelity_url' to "vircadia_url"
String is used to form start of snapshot-image metadata.
First step of issue #1192.
2021-04-23 12:05:34 +10:00
Kalila
5ec026255c
Merge pull request #938 from vircadia/feature/qt-update
Update to Qt 5.15.2
2021-04-22 17:36:53 -04:00
Dale Glass
1e3af6c32c Link to pthread last 2021-04-22 23:34:23 +02:00
David Rowe
f4af0be95b Conditionally apply ReadyPlayerMe synonyms 2021-04-21 10:14:46 +12:00
David Rowe
a6d8e150f0 Move and rename ReadyPlayerMe synonyms 2021-04-21 09:47:24 +12:00
David Rowe
bfb42c8233 Merge branch 'master' into feature/rpm-blendshapes 2021-04-21 08:57:52 +12:00
David Rowe
f67410a5e9 Merge branch 'master' into fix/gltf-colors 2021-04-21 08:31:17 +12:00
Kalila
bb9460f6d9
Merge pull request #1162 from ctrlaltdavid/fix/osx-dmgs
Revise OSX DMGs
2021-04-19 17:01:05 -04:00
Kalila
dec3369583
Merge pull request #1178 from JulianGro/rename_fbx_to_model-serializers
Rename fbx to model serializers
2021-04-19 16:00:21 -04:00
Kalila
7bd91bcfb0
Merge pull request #1129 from digisomni/fix/save-lod-settings
Fix LOD manager defaults + settings not being saved correctly.
2021-04-19 15:45:30 -04:00
Kalila L
5c76139816 Update copyright headers. 2021-04-19 15:44:52 -04:00
Kalila
77745b314b
Merge pull request #1182 from ctrlaltdavid/fix/minitablet-goto
Fix minitablet goto
2021-04-19 15:38:50 -04:00
Kalila
cb579ed49c
Update README.md 2021-04-19 14:36:03 -04:00
Kalila
96b7944f56
Update README.md 2021-04-19 14:32:12 -04:00
David Rowe
0b536f0cae Support ReadyPlayerMe blendshapes in glTF files 2021-04-19 11:10:25 +12:00
Kalila
9463f8be0f
Merge pull request #1171 from daleglass/windows_memory_debugging
Implement VIRCADIA_MEMORY_DEBUGGING for Windows
2021-04-18 16:22:25 -04:00
Kalila
ec853de84c
Update README.md
Use logo instead of text.
2021-04-17 14:54:33 -04:00
David Rowe
71bcabfc0a Remove unused enum 2021-04-17 21:30:46 +12:00
David Rowe
ab34c6ef96 Default to mini tablet disabled 2021-04-17 16:56:43 +12:00
David Rowe
a81a550e94 Replace old Goto in mini tablet with Explore app 2021-04-17 16:55:16 +12:00
David Rowe
a26f11a84f Adjust glTF mesh colors 2021-04-17 14:22:20 +12:00
Julian Groß
1cadfcc284
Merge branch 'master' into feature/qt-update 2021-04-16 01:55:51 +02:00
Kalila
0150c46836
Merge pull request #1142 from SilverfishVR/serverlessV3
Load serverless tutorial from local disk
2021-04-15 19:10:52 -04:00
Kalila
d0d9d4b30b
Merge pull request #1163 from JulianGro/initial_linux_aarch64
Initial partial linux aarch64 support
2021-04-15 19:07:44 -04:00
Julian Groß
f6d9cd6fb8 Fix Android building 2021-04-15 23:52:35 +02:00
Julian Groß
12c3bd80e5 Fix GLTFSerializer not being up to date 2021-04-15 23:49:02 +02:00
Kalila
a35b9c4563
Merge pull request #1126 from daleglass/hash_all_fingerprints
Hash Windows and Mac machine fingerprints.
2021-04-15 17:46:17 -04:00
Kalila
708d52c700
Merge pull request #1173 from daleglass/fix-cmake-mismatched-if
Fix mismatched if in CMake warning
2021-04-15 17:11:01 -04:00
Julian Groß
8573425f68 Update library headers 2021-04-15 20:15:36 +02:00
Julian Groß
b1852eabd4 Update jsdoc entry 2021-04-15 19:45:52 +02:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
David Rowe
5b18b1f1a9 Update new Windows build instructions to Qt 5.15.2 2021-04-15 20:15:00 +12:00
David Rowe
12df7e4045 Merge branch 'master' into feature/qt-update
# Conflicts:
#	BUILD_WIN.md
2021-04-15 20:05:49 +12:00
Kalila L
35b3c76da9 Merge remote-tracking branch 'upstream/master' into fix/save-lod-settings 2021-04-14 18:48:59 -04:00
Kalila
15505623b4
Merge pull request #1176 from ctrlaltdavid/feature/qt-update-misc
Update browser Chrome version
2021-04-14 16:24:13 -04:00
Kalila
43983e3df6
Merge pull request #1177 from paranoimia/winbuild-fix
Update BUILD_WIN.md with Qt Info
2021-04-13 02:54:22 -04:00
RKH
2c5b60d233
Edits for clarity as per the suggestions of the Glorious Leader.
All hail the glorious leader.

Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
2021-04-12 22:14:58 -07:00