Commit graph

84974 commits

Author SHA1 Message Date
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
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
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
Dale Glass
3f20f6ec66 Generate all files in the build dir, don't touch source dir
This makes it so that RCC files and jsdoc are both generated into
the build directory.
2021-07-11 19:26:51 +02:00
Dale Glass
6314cd33ed Fix "Ninja does not support toolset specification" on Windows 2021-07-11 00:48:11 +02:00
Kalila L
8df362ef1f Add "Talk" link to "Help" menu. 2021-07-10 18:05:28 -04:00
daleglass
45f2b672b5
Merge pull request #365 from daleglass/linux_crash_handler
Linux crash handler
2021-07-10 20:32:53 +02:00
Dale Glass
e3004af61a More logging for crash reporting
* Make it clear in cmake if crash reporting is going to be used
* Log warning on startup if there's no crash reporting
2021-07-10 01:43:18 +02:00
Dale Glass
52add88273 Undo accidental change that broke reporting on Windows 2021-07-10 01:43:18 +02:00
daleglass
15dfa04c07 Whitespace review fix
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-07-10 01:43:18 +02:00
daleglass
e2eab15469 Whitespace review fix
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-07-10 01:43:18 +02:00
Dale Glass
c4f3e1e263 Fix cmake warning about crashpad name 2021-07-10 01:43:18 +02:00
Dale Glass
186e784d89 Rework crashpad initialization
* Don't abort on startup if we can't find our own path
* Try to locate our own path by looking in /proc in Linux -- should fix AppImage issues
* Add extensive logging
2021-07-10 01:43:18 +02:00
Dale Glass
567b0d84ef Update crash handler to latest build 2021-07-10 01:43:17 +02:00
Dale Glass
9a5c1ac24a Use latest crashpad build.
This one uses libcurl, which may work better.
2021-07-10 01:43:17 +02:00
Dale Glass
86e2da729e Try library built with SSL 2021-07-10 01:43:17 +02:00
Dale Glass
486d961f48 Add support for crashpad on Linux 2021-07-10 01:43:17 +02:00
Kalila
70e3c1769f
Merge pull request #1283 from ctrlaltdavid/dev/rename-hifisockaddr
Rename "HifiSockAddr" to "SockAddr"
2021-07-08 17:27:57 -04:00
Kalila
fc93feef2b
Merge pull request #1285 from vircadia/fix/stale-bot
Reduce stale-bot's aggressiveness.
2021-07-08 17:24:33 -04:00
Kalila
1cdebee9b6
Update stale.yml 2021-07-08 17:21:19 -04:00
Kalila
9191ca7aa3
Reduce stale-bot's aggressiveness.
Stale bot will no longer close issues and the comment has been made more "human".
2021-07-07 20:09:53 -04:00
Kalila
aea24855d9
Merge pull request #1276 from JulianGro/no_submodules
GitHub Actions do not clone submodules
2021-07-07 18:51:46 -04:00
Kalila
e471b1d83f
Update README.md 2021-07-07 05:55:36 -04:00
HifiExperiments
12833b9c93 CR and percent decoding 2021-07-06 19:13:33 -07:00
HifiExperiments
bdbb88084b CR 2021-07-05 21:02:40 -07:00
David Rowe
6a17143df8 Rename "HifiSockAddr" to "SockAddr" 2021-07-06 13:23:57 +12:00
HifiExperiments
7f99ddca2e merge with master 2021-07-05 16:48:45 -07:00
Kalila
cdd2341880
Merge pull request #1278 from ctrlaltdavid/fix/addressmanager-jsdoc
Misc fixes to AddressManager JSDoc
2021-07-05 17:02:20 -04:00
David Rowe
cb89eabf74 Typo 2021-07-06 08:48:43 +12:00
Kalila
1c41ace1cf
Merge pull request #1277 from ctrlaltdavid/fix/doxygen-quiet
Quiet Doxygen output
2021-07-05 14:07:37 -04:00
David Rowe
319f3e7122 Misc fixes to AddressManager JSDoc 2021-07-05 10:43:50 +12:00