Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-21 18:14:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85500 commits 29 branches 28 tags 1.2 GiB
Commit graph

85500 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
3603520c94 fillPacketHeader() can be private 2021-07-30 14:13:44 +12:00
David Rowe
fa01ead130 Add extra WebRTC debug 2021-07-30 14:13:15 +12:00
David Rowe
ed36321e25 Fill in connected client's ports with WebRTC data channel IDs 2021-07-30 14:12:38 +12:00
Dale Glass
b293dd2816
Merge pull request #1288 from digisomni/feature/add-talk-to-help 
Add "Talk" link to "Help" menu.
 2021-07-29 23:40:24 +02:00
Kalila
4b6d1e47e2
Fix syntax error in Menu.cpp. 2021-07-26 01:10:55 +02:00
Kalila
10e8d9f6d8
Update NetworkingConstants.h 2021-07-23 20:44:24 -04:00
Kalila
030cdbf348
Update Menu.cpp 2021-07-23 20:43:33 -04:00
Dale Glass
567ff291fe
Merge pull request #943 from daleglass/cmake-build-in-build-dir 
Cmake: build in build dir
 2021-07-22 23:26:21 +02:00
David Rowe
38f7506c5e Fix erroneous domain server log message 2021-07-21 20:06:18 +12:00
David Rowe
320b5a2d22 Fix HifiSockAddr references 2021-07-21 19:54:40 +12:00
David Rowe
74c2788a14 Merge branch 'master' into dev/rename-hifisockaddr-webapp 
# Conflicts:
#	assignment-client/src/AssignmentClient.cpp
#	domain-server/src/DomainServer.cpp
#	libraries/networking/src/DomainHandler.cpp
#	libraries/networking/src/LimitedNodeList.cpp
#	libraries/networking/src/LimitedNodeList.h
#	libraries/networking/src/SockAddr.cpp
#	libraries/networking/src/SockAddr.h
#	libraries/networking/src/udt/Socket.cpp
#	libraries/networking/src/udt/Socket.h
#	tools/ice-client/src/ICEClientApp.cpp
 2021-07-21 15:03:29 +12:00
Dale Glass
32c3725b5d Define _USE_MATH_DEFINES everywhere that uses math constants 
On Win32, things are failing to build with messages like:

RenderableEntityItem.cpp(674,51): error C2065: 'M_PI': undeclared identifier

This is because as per Microsoft documentation, _USE_MATH_DEFINES is needed to
obtain constants like M_PI:

https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=msvc-160

It seems this worked previously due to some quirk of CMake, but stopped working
after some reordering. This change makes this definition explicit where it is needed.
 2021-07-17 19:34:26 +02:00
Kalila L
11e1e0c201 Update image for supporter: ksuprynowicz. 2021-07-16 04:33:59 -04:00
Kalila L
f795418fd7 Update supporter info for README.md. 2021-07-16 04:23:21 -04:00
Kalila
dfd71ab18b
Merge pull request #1259 from ctrlaltdavid/dev/webrtc-packet 
First exchange of Vircadia protocol packets with the Vircadia Web SDK
 2021-07-15 22:34:13 -04:00
Kalila
35948d7467
Merge branch 'master' into fix/cmdline-discovery 2021-07-15 22:21:47 -04:00
Kalila
241c54919d
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-07-15 22:19:58 -04:00
Kalila
42ffb5709c
Merge pull request #1270 from daleglass/use_qt_endl 
Replace uses of endl on Qt classes with Qt::endl
 2021-07-15 22:18:36 -04:00
Kalila
f62c964fdc
Typo, remove double definitions of constants. 2021-07-15 22:16:32 -04:00
Kalila
d75df82687
Merge pull request #1102 from HifiExperiments/materials2 
Material improvements 2: reference textures/materials by entity ID
 2021-07-15 17:42:40 -04:00
Kalila
8e4a0f8880
Merge branch 'master' into feature/add-talk-to-help 2021-07-15 17:34:29 -04:00
Kalila
6401edd3ed
Merge pull request #1289 from daleglass/fix-ninja-error 
Fix "Ninja does not support toolset specification" on Windows
 2021-07-15 17:30:05 -04:00
Kalila
874af7a558
Merge pull request #1274 from daleglass/gha-archive-cmake-logs 
Archive cmake logs, for debugging
 2021-07-15 17:08:43 -04:00
Kalila
0193e0f4d6
Merge pull request #1244 from digisomni/fix/lookup-string-spaces 
Add ability for 'handleLookupString' to have spaces.
 2021-07-12 17:07:29 -04:00
Dale Glass
276a0506bf Fix building interface without npm 2021-07-11 19:26:51 +02:00
Dale Glass
cf75200231 Have cmake be verbose about whether NPM has been detected 2021-07-11 19:26:51 +02:00
Dale Glass
96ad5e971b Remove redundant cmake code 2021-07-11 19:26:51 +02:00
Dale Glass
6a62dc10e6 Fix resources and jsdoc dependencies 2021-07-11 19:26:51 +02:00
Dale Glass
c95de72174 Fix copying jsdoc to interface 
Take the jsdoc from tools/jsdoc and copy it to interface.

A subtle issue was found: It turns out that for cmake it matters
what gets parsed first, especially if you rely on setting a variable
in one project and reading it in another.

This can result in things like builds that fail the first time, then
work after re-running cmake.

Generation of jsdoc and screenshare were moved above interface,
because they're a dependency of it.
 2021-07-11 19:26:51 +02:00
daleglass
60164dbf08 Whitespace review fixes 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-07-11 19:26:51 +02:00
Dale Glass
70895df49e Generate nitpick resources with qt5_add_binary_resources 
Also, it appears there was a bug where nitpick depended on interface's
resources rather than its own.
 2021-07-11 19:26:51 +02:00
Dale Glass
7546be2e8a Use qt5_add_binary_resources instead of custom command. 
Also move find_package for Qt to the top, so that it finds the
rcc binary before it's needed
 2021-07-11 19:26:51 +02:00
Dale Glass
f7f01c2acc Don't copy RCC, it's generated where it's needed 2021-07-11 19:26:51 +02:00