David Rowe
28c408de98
Typo
2021-06-05 18:23:37 +12:00
David Rowe
2402a5e333
Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-datachannel
...
# Conflicts:
# domain-server/src/DomainServer.h
2021-06-05 14:27:18 +12:00
David Rowe
4681475269
Merge branch 'master' into dev/webrtc-datachannel
2021-06-05 14:21:29 +12:00
Kalila
d8a0d13812
Merge pull request #1206 from odysseus654/pr/drop-script-debugging
...
drop remaining references to QScriptEngineDebugger
2021-06-03 18:01:40 -04:00
Kalila
a408294943
Merge pull request #1227 from vircadia/docs/update-macos-installer-docs
...
Update MacOS packaging instructions.
2021-06-03 17:27:38 -04:00
Kalila
c2b7f73e59
Merge pull request #1207 from daleglass/fix-draco-on-gcc11
...
Fix draco compilation on gcc11
2021-06-03 17:08:55 -04:00
Kalila
cab8a26def
Merge pull request #1239 from ctrlaltdavid/dev/webrtc-signaling
...
Conditionally include WebRTCSignalingServer.h
2021-06-02 19:44:30 -04:00
David Rowe
1dcee6cc1d
Conditionally include WebRTCSignalingServer.h
2021-06-02 23:00:19 +12:00
Kalila
229164c5b9
Merge pull request #1219 from ctrlaltdavid/dev/webrtc-signaling
...
WebRTC Signaling Channel
2021-06-02 05:44:03 -04:00
Kalila
6ce944abd1
Update INSTALLER.md
2021-06-01 12:25:45 -04:00
Kalila
f6f7a18669
Merge pull request #1236 from digisomni/fix/api-docs-updates
...
Some APIDocs metadata fixes.
2021-06-01 12:24:13 -04:00
David Rowe
645dc265ab
Fix non-WebRTC domain server builds
2021-06-01 15:41:25 +12:00
David Rowe
c28f4749ed
Doxygen tidying
2021-06-01 09:34:38 +12:00
David Rowe
63ec933290
Code tidying
2021-06-01 09:34:17 +12:00
David Rowe
e6c49cf407
Fix data channel ID
2021-06-01 09:32:28 +12:00
Kalila L
8b66c22655
Statically generate canonical link tag instead.
2021-05-31 06:39:52 -04:00
Kalila L
2a6e0f0efc
Add JSDoc canonical link tag; add CNAME file in root.
2021-05-31 06:01:36 -04:00
Kalila L
7ccdbdea64
Some APIDocs metadata fixes.
2021-05-31 05:43:12 -04:00
David Rowe
6c37628468
Add WebRTC data channel
2021-05-31 12:29:48 +12:00
Kalila
b3f55b473f
Merge pull request #1231 from vircadia/fix/gren-config
...
Add URL for .grenrc.js repository
2021-05-28 18:43:50 -04:00
David Rowe
aa1c32ec53
Rename new domain server environment variable
2021-05-29 09:25:15 +12:00
Kalila
84c90bfd7d
Add URL for .grenrc.js reposi
2021-05-28 16:24:20 -04:00
Kalila
9640a13800
Merge pull request #1226 from vircadia/feature/gren-changelog-gen
...
Add "gren" configuration for easy changelog generation
2021-05-27 17:09:28 -04:00
Kalila
06b09dabc0
Update MacOS packaging instructions.
2021-05-25 20:22:41 -04:00
Kalila L
6341dcce94
Create .grenrc.js
2021-05-25 18:46:53 -04:00
Dave_K
b020558244
fix PR autobuild for ubuntu-18.04, android with correct cmake version ( #1225 )
2021-05-25 16:44:32 -04:00
Kalila
15a9de3a06
Update README.md
2021-05-25 02:32:51 -04:00
David Rowe
9472d689c8
Update to the latest Vircadia-Web master
2021-05-21 11:51:30 +12:00
Kalila
f1b4c8e62d
Merge pull request #1218 from daleglass/fix-qt5.15-on-gcc11
...
Add patch for building Qt 5.15 on gcc11
2021-05-20 17:17:02 -04:00
Kalila
d0bc5df464
Merge pull request #1220 from ctrlaltdavid/fix/doxygen-readme
...
Fix typo in Doxygen ReadMe
2021-05-20 17:14:02 -04:00
David Rowe
ce31b70a1d
Update Windows WebRTC from version M81 to M84
2021-05-21 07:58:10 +12:00
David Rowe
d0eccfda49
Fix typo in Doxygen ReadMe
2021-05-21 07:15:06 +12:00
Dale Glass
15effecd17
Add patch for building Qt 5.15 on gcc11
...
gcc11 is requires #include <limits> in places previous versions didn't.
2021-05-20 00:18:46 +02:00
David Rowe
6e3c680487
Add Doxygen comments information
2021-05-20 09:51:51 +12:00
David Rowe
6afb8044ea
Add WebRTC signaling channel
2021-05-20 09:51:14 +12:00
David Rowe
adfb428796
Distinguish use of WebRTC features - audio versus data channel
2021-05-20 09:43:18 +12:00
Dale Glass
9ef9a89d95
Fix draco compilation on gcc11
...
The previous version breaks on Fedora 34, and likely other distros
with recent compilers due to not including cstddef and limits headers.
This is already fixed upstream, but only in master. And looking at
google/draco#704 there may be compatibility issues with using the
latest code.
So for now we're upgrading from 1.3.3 to 1.3.6 and adding the fix.
2021-05-18 00:44:29 +02:00
David Rowe
42ce3b34a9
Merge pull request #1217 from ctrlaltdavid/fix/jsdoc
...
Fix missed JSDoc tag change
2021-05-17 08:02:14 +12:00
Kalila
e96994b031
Update README.md
2021-05-16 11:36:15 -04:00
David Rowe
8545b8c6c1
Fix missed JSDoc tag change
2021-05-16 21:44:16 +12:00
daleglass
97352b8858
Merge pull request #1213 from AleziaKurdis/CreateApp-CopyPasteLocationRotation
...
Create app: Copy-Paste Position and Rotation
2021-05-15 20:25:04 +02:00
Kalila
1ed0b2c3c5
Merge pull request #1140 from vircadia/dependabot/npm_and_yarn/screenshare/y18n-4.0.1
...
Bump y18n from 4.0.0 to 4.0.1 in /screenshare
2021-05-15 14:24:46 -04:00
Kalila
1f57aef4de
Merge pull request #1211 from vircadia/dependabot/npm_and_yarn/screenshare/hosted-git-info-2.8.9
...
Bump hosted-git-info from 2.8.5 to 2.8.9 in /screenshare
2021-05-15 14:20:36 -04:00
Kalila
71493e15d6
Merge pull request #1212 from ctrlaltdavid/feature/doxygen
...
Add Doxygen tool for compiling C++ documentation
2021-05-14 00:29:18 -04:00
David Rowe
27779030c8
Perl isn't needed after all
2021-05-14 16:27:09 +12:00
David Rowe
f3ee99fe5a
Apply suggestions from code review
...
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
2021-05-14 15:14:53 +12:00
Alezia Kurdis
a4483e6367
Safeguard code for Copy/Paste Position/Rotation
...
Safeguard code for Copy/Paste Position/Rotation
The 4 actions has now validations to avoid to only have those validation on the UI.
Making sure there is a single selection to execute these actions:
Copy Position
Copy Rotation
Making sure there is a selection that doesn't contain locked entity and that we have a copied value in order to execute these actions:
Paste Location
Paste Rotation
2021-05-13 21:45:49 -04:00
Alezia Kurdis
cf66d1aca3
Copy Paste Location and Rotation new button style
...
Copy Paste Location and Rotation new button style
2021-05-12 22:11:15 -04:00
Alezia Kurdis
8827f9e8de
Add a secondary button class for on field actions
...
Add a secondary button class for on field actions
To use when actions are to be added to a specific field.
Like for Copy/Paste Location and Rotation.
These smaller buttons make easier to figure that those actions are tied to a specific field or group of field.
2021-05-12 22:10:09 -04:00
Alezia Kurdis
c1ee8801e0
Add Location and Rotation Copy-Paste
...
Add Location and Rotation Copy-Paste
2021-05-12 00:12:27 -04:00