Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 13:40:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85082 commits 22 branches 28 tags 1.2 GiB
Commit graph

85082 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
dddabecc84 Use domain server-assigned WebRTC data channel ID in assignment clients 2021-09-04 14:25:21 +12:00
David Rowe
911dc2aff3 Include socket type in domain packets 
Required for user client info sent to assignment clients from the domain server.
 2021-09-04 10:36:13 +12:00
David Rowe
ff72b422b3 Fix WebRTCDataChannels crash 2021-09-03 19:04:24 +12:00
David Rowe
65dec6dfd8 Socket type isn't used in all code 2021-09-02 15:00:26 +12:00
David Rowe
b1050dc83a Merge branch 'master' into dev/webapp-master-update 2021-09-01 21:52:04 +12:00
Kalila
211fd474fe
Merge pull request #1313 from ctrlaltdavid/dev/webrtc-assignment-clients 
Assignment client WebRTC connections
 2021-08-31 19:17:17 -04:00
David Rowe
adc94a280e Log some warnings 2021-08-29 14:19:39 +12:00
Kalila
c36afe76e1
Merge pull request #1316 from AleziaKurdis/CreateApp-ZeroRotationButton 
Create app - "Reset Rotation" button
 2021-08-24 02:11:47 -04:00
Alezia Kurdis
113915637b
Adjustment to solve red button css. 
Added the red class to the Reset Rotation button.
 2021-08-23 23:28:31 -04:00
Kalila
086f56f7ec
Merge pull request #1315 from Madders/explore-app-updates 
Explore app metaverse api updates
 2021-08-22 23:14:59 -04:00
Kalila
63d91e5506
Merge pull request #1314 from SilverfishVR/master 
make HUD bubble/shield button optional
 2021-08-22 16:35:57 -04:00
SilverfishVR
4d21cedf9d
Update menu item name 
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
 2021-08-22 10:04:37 +02:00
Kalila
2a4ad7b163
Merge pull request #1251 from digisomni/fix/cmdline-discovery 
Add disable domain port auto discovery by assignment client option.
 2021-08-22 03:05:21 -04:00
Martin Allerton
1a02b918d7 formatting changes and added axios license 
Updates following comment from ctrlaltdavid
 2021-08-21 23:05:11 +01:00
SilverfishVR
a7dee4bb8a
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-08-21 17:54:10 +02:00
David Rowe
1605039929 Tidying 2021-08-21 21:11:42 +12:00
Kalila
45e10f0670
Merge pull request #1303 from daleglass/qt5-fix-qtcpsocket-error 
Replace deprecated QAbstractsocket::error with QAbstractSocket::error…
 2021-08-19 20:51:27 -04:00
Kalila
f6760e90b4
Merge pull request #1293 from digisomni/docs/readme-support 
Update supporter info for README.md.
 2021-08-19 20:48:28 -04:00
Kalila
6b0f4c107b
Merge pull request #1301 from daleglass/qt5-fix-qdir-operator-assign 
Fix QDir::operator= is deprecated
 2021-08-19 20:48:14 -04:00
Kalila
0af1ef64ca
Merge pull request #1309 from daleglass/log-resources-location 
Log the location of the primary resources file
 2021-08-19 17:12:37 -04:00
Kalila
bf9a4e43f0
Merge pull request #1311 from daleglass/copy-resources-to-exec-dir 
Copy resources to interface's exe directory
 2021-08-19 17:07:43 -04:00
Dale Glass
bb1884b361 Copy resources to interface's exe directory 
This should have no effect on Unix, but fix the resource issue on Win32
 2021-08-19 01:04:09 +02:00
Martin Allerton
481125f978 Explore app metaverse api updates 
Blended the metaverse api places data in to the list with the beacon data. Also lightened the icons at the top as they were a little lost.
 2021-08-18 23:54:23 +01:00
SilverfishVR
0cf71bd3e1 make HUD bubble/shield button optional 
Adds an menu item in "Settings" to toggle the HUD shield/bubble button on or off.
Shield button remains available in the tablet or toolbar, it is called "HUD shield button" but suggestions are welcome

fixes https://github.com/vircadia/vircadia/issues/1210
 2021-08-18 22:19:10 +02:00
David Rowe
ace612d038 Assignment client type is not known at construction 2021-08-18 21:27:35 +12:00
David Rowe
5d15ebb723 WebRTC data channel with assignment clients 2021-08-18 20:21:56 +12:00
David Rowe
a3c1d50478 WebRTC signaling with assignment clients via domain server 2021-08-18 20:10:11 +12:00
Alezia Kurdis
b61d978b0a
Change the label for "Reset Rotation" 
Change the label for "Reset Rotation"
 2021-08-17 21:48:12 -04:00
David Rowe
9b2c773805 Move WebRTCSignalingServer into Domain Server 2021-08-17 22:37:43 +12:00
Kalila
29b4fea1d2
Merge pull request #1299 from ctrlaltdavid/dev/webrtc-doxygen 
Fix a couple of WebRTC Doxygen typos
 2021-08-16 00:05:44 -04:00
Kalila
4c0bda8bf9
Merge pull request #1300 from ctrlaltdavid/dev/webrtc-domain-server 
Anonymous Web SDK connection to domain server
 2021-08-15 23:51:36 -04:00
Alezia Kurdis
494740f819
Add a "Set Rotation to Zero" button 
Add a "Set Rotation to Zero" button
in properties tab (Spatial section)
of the create app.
 2021-08-15 22:09:27 -04:00
Alezia Kurdis
0d39eea2a6
Add "Set Rotation to Zero" 
Add a "Set Rotation to Zero" button
in properties tab (Spatial section)
of the create app.
 2021-08-15 22:08:46 -04:00
Alezia Kurdis
1122156d3a
Add secondary red class button 
Add secondary red class button
for "Set Rotation to Zero" button
 2021-08-15 22:07:00 -04:00
Kalila
d179e70671
Merge pull request #1307 from vircadia/dependabot/npm_and_yarn/screenshare/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /screenshare
 2021-08-14 14:19:02 -04:00
Kalila L
76010bf650 Update help text for disable domain server port auto discovery option. 2021-08-13 10:29:16 -04:00
Kalila L
e4cb87ba5d CR. 2021-08-12 23:02:39 -04:00
Kalila
019e012f2e
Apply suggestions from code review 
Co-authored-by: Heather Anderson <heath@odysseus.anderson.name>
 2021-08-12 23:01:13 -04:00
Dale Glass
8a8093e529 Log the location of the primary resources file 
Also emit the full path to the file in the exception
 2021-08-12 23:49:44 +02:00
Kalila
6eb7b9ecff
Merge pull request #1302 from daleglass/qt5-fix-qstring-splitbehavior 
Fix QString::SplitBehavior deprecation, replace with Qt::
 2021-08-12 17:13:03 -04:00
Dale Glass
ae9f2aa1ee Update slots to the new syntax, use QAbstractSocket::errorOccurred 2021-08-12 22:53:24 +02:00
dependabot[bot]
eb146fa434
Bump path-parse from 1.0.6 to 1.0.7 in /screenshare 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-12 08:34:58 +00:00
Kalila
8a858a7c26
Merge pull request #1296 from ctrlaltdavid/dev/webapp-master-update 
Update webapp branch to recent master
 2021-08-07 14:13:17 -04:00
Dale Glass
24ab523acc Replace deprecated QAbstractsocket::error with QAbstractSocket::errorOccurred 2021-08-06 23:26:02 +02:00
Dale Glass
24b2cdfcd2 Fix QString::SplitBehavior deprecation, replace with Qt:: 2021-08-06 20:16:10 +02:00
Dale Glass
8d19d08268 Fix QDir::operator= is deprecated 2021-08-06 18:44:53 +02:00
David Rowe
500da963ad Make parameter names consistent across usages 2021-08-04 16:11:04 +12:00
David Rowe
9be1c08c8c Fix domain server crash 2021-07-31 23:03:48 +12:00
David Rowe
8528422834 Fix WebRTC Doxygen typos 2021-07-30 14:18:34 +12:00
David Rowe
0ea6d88bf5 Fix function parameter ID 2021-07-30 14:14:36 +12:00