kasenvr
|
2ecbf49176
|
Merge pull request #399 from HifiExperiments/controller
Fix various crashes/issues in controller scripting API
|
2020-06-18 17:21:43 -04:00 |
|
kasenvr
|
13451bd275
|
Merge pull request #384 from JulianGro/rebrand
Rebranding stuff
|
2020-06-18 17:12:47 -04:00 |
|
kasenvr
|
d79e5d4a35
|
Merge pull request #377 from daleglass/fix_linux_audio_warning
Fix Linux default audio device debug messages
|
2020-06-18 17:11:21 -04:00 |
|
kasenvr
|
953ade0e98
|
Merge pull request #280 from daleglass/prometheus_exporter
Add Prometheus exporter
|
2020-06-18 17:08:39 -04:00 |
|
Julian Groß
|
18318fdf71
|
Merge branch 'v2020.2.2-rc' into rebrand
|
2020-06-18 09:16:47 +02:00 |
|
kasenvr
|
e19267e191
|
Merge pull request #440 from daleglass/disable-crash-logger-by-default
Disable crash logger by default
|
2020-06-11 17:29:26 -04:00 |
|
kasenvr
|
951936e896
|
Merge pull request #425 from ctrlaltdavid/fix/delete-in-serverless
Fix not being able to delete entities in serverless domains
|
2020-06-11 17:14:34 -04:00 |
|
Dale Glass
|
b681f99d21
|
Rename the crash reporting settings to force new default value
Doing this ensures the new default applies to all clients, without
having to reset the configuration.
|
2020-06-11 20:00:47 +02:00 |
|
Dale Glass
|
02eb4ccd33
|
Disable crash logger by default
|
2020-06-11 01:26:21 +02:00 |
|
motofckr9k
|
3d05cdd61e
|
Merge remote-tracking branch 'refs/remotes/kasen/master'
Conflicts:
BUILD_WIN.md
CODING_STANDARD.md
LICENSE
cmake/installer/installer-header.bmp
cmake/installer/installer.ico
cmake/installer/uninstaller-header.bmp
interface/resources/images/about-vircadia.png
interface/resources/images/vircadia-logo.svg
interface/resources/qml/LoginDialog.qml
interface/resources/qml/dialogs/TabletLoginDialog.qml
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
interface/src/Application.cpp
pkg-scripts/athena-server.spec
scripts/system/more/app-more.js
scripts/system/more/css/styles.css
scripts/system/more/more.html
|
2020-06-10 02:49:13 +02:00 |
|
Dale Glass
|
443d769eac
|
Make it possible to turn the Prometheus exporter on and off
The settings are available from the domain settings page.
|
2020-06-07 02:47:39 +02:00 |
|
Dale Glass
|
a8bd627cda
|
Add Prometheus exporter
Exports domain statistics for the domain on port 9703 (officially reserved)
|
2020-06-07 02:47:39 +02:00 |
|
Kasen IO
|
fda40d56d4
|
Merge branch 'master' into feature/further-rebranding
|
2020-06-06 18:43:03 -04:00 |
|
David Rowe
|
5f83827198
|
Fix not being able to delete entities in serverless domains
|
2020-06-06 10:36:30 +12:00 |
|
kasenvr
|
72d931688c
|
Merge pull request #409 from kasenvr/fix/entity-null-check
Bugfix: Add null check to entity render clearing to fix crash.
|
2020-06-05 13:09:41 -04:00 |
|
kasenvr
|
5f15e8df04
|
Merge pull request #418 from Misterblue/fix/includes-for-VS-build
Include <stdexcept> for building on Windows10 with Visual Studio 2019
|
2020-06-04 17:30:15 -04:00 |
|
Robert Adams
|
ee1d46af94
|
Include <stdexcept> so building on Windows10 with Visual Studio 2019 works.
|
2020-06-04 09:35:45 -07:00 |
|
kasenvr
|
103fd8eef2
|
Merge branch 'master' into fix/revert-instancing-temporarily-1
|
2020-06-03 22:44:32 -04:00 |
|
HifiExperiments
|
ade6bf24bb
|
fix issues with glb urls
|
2020-06-03 15:19:54 -07:00 |
|
Kasen IO
|
21fd10d154
|
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
|
2020-06-03 16:08:18 -04:00 |
|
Kasen IO
|
94c230b78b
|
Add null check to entity render clearing to fix crash.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
|
2020-06-01 22:13:52 -04:00 |
|
kasenvr
|
1a46b28b71
|
Merge pull request #62 from HifiExperiments/blendshapes
Support blendshapes on model entities
|
2020-05-31 18:34:42 -04:00 |
|
kasenvr
|
4cca7f6f75
|
Merge pull request #281 from HifiExperiments/parenting2
Improve performance of MyAvatar::simulate when you have lots of descendants
|
2020-05-31 14:47:22 -04:00 |
|
kasenvr
|
8157be5b5a
|
Merge pull request #405 from kasenvr/v0.86.0-k2.1
Merge K2.1 into Master
|
2020-05-30 18:49:38 -04:00 |
|
HifiExperiments
|
d15527dd04
|
no negatives
|
2020-05-28 15:47:05 -07:00 |
|
HifiExperiments
|
3850271b97
|
fix various crashes/issues in controller scripting API
|
2020-05-28 15:18:22 -07:00 |
|
kasenvr
|
3c487106a7
|
Merge branch 'master' into fix/other-renamings
|
2020-05-28 03:46:36 -04:00 |
|
Kasen IO
|
6c6a405020
|
Add periods and remove double copyright in tabletaboutdialog.qml
|
2020-05-25 16:41:16 -04:00 |
|
Kasen IO
|
a4bf1c4d82
|
Update copyright headers.
|
2020-05-25 15:59:43 -04:00 |
|
motofckr9k
|
d406b81b47
|
Big rebrand
|
2020-05-22 20:35:27 +02:00 |
|
Dale Glass
|
2ec541f2ef
|
Fix Linux default audio device debug messages
Linux had no default audio implementation, implemented using
QAudioDeviceInfo.
|
2020-05-20 22:31:02 +02:00 |
|
kasenvr
|
7996698c8f
|
Merge branch 'master' into fix/other-renamings
|
2020-05-18 15:10:32 -04:00 |
|
Kasen IO
|
335f0c86dd
|
Reduce scope of PR.
|
2020-05-17 22:13:57 -04:00 |
|
|
0228c35d79
|
Update JSDOC in EntityItemPropeties.cpp to vircadia.com
Also strips trailing whitespaces from EntityItemProperties.cpp.
|
2020-05-17 14:46:33 -05:00 |
|
Dale Glass
|
407b2a4f22
|
Remove all uses of QString::null
It's deprecated and produces a warning on Qt 5.14
|
2020-05-17 18:00:02 +02:00 |
|
motofckr9k
|
95a64b2f2c
|
Change standard log file names from "hifi-.." to "vircadia-.."
|
2020-05-13 22:59:51 +02:00 |
|
kasenvr
|
c5fdacf975
|
Merge pull request #301 from HifiExperiments/modelBackface
Models support flipped normals on double sided geometry
|
2020-05-13 16:06:26 -04:00 |
|
Dale Glass
|
95570d5abc
|
Kill the entity in processRemovedEntities before calling prepareEntityForDelete
This was removed back in 9d92546a and causes an assertion (#337)
|
2020-05-10 18:41:03 +02:00 |
|
daleglass
|
affcc6f918
|
Merge pull request #300 from thoys/feature/gha_vircadia
GitHub Actions (with artifact uploading)
|
2020-05-08 17:17:45 +02:00 |
|
Kasen IO
|
430d748b29
|
Bump packet version size up.
|
2020-05-07 21:33:20 -04:00 |
|
HifiExperiments
|
405d557725
|
Merge branch 'master' into blendshapes
|
2020-05-07 13:38:59 -07:00 |
|
HifiExperiments
|
8017e30ab9
|
Merge branch 'master' into blendshapes
|
2020-05-07 13:27:22 -07:00 |
|
HifiExperiments
|
91e177f68b
|
add spaces after fors
|
2020-05-07 13:23:22 -07:00 |
|
HifiExperiments
|
3bf690571c
|
Merge branch 'master' into zoneOcclusion
|
2020-05-07 13:13:20 -07:00 |
|
Thijs Wenker
|
8a76753135
|
Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia
|
2020-05-07 11:07:28 +02:00 |
|
David Rowe
|
5e997d7b60
|
Fix up Vircadia URLs
|
2020-04-27 20:38:23 +12:00 |
|
David Rowe
|
2d070e630b
|
Merge branch 'master' into fix/jsdoc-fixes
# Conflicts:
# interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
# interface/resources/qml/hifi/commerce/checkout/Checkout.qml
# interface/resources/qml/hifi/commerce/purchases/Purchases.qml
# interface/src/Application.cpp
|
2020-04-26 20:38:43 +12:00 |
|
Heather Anderson
|
e29271d8ca
|
rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>)
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
|
2020-04-25 20:32:38 -07:00 |
|
Thijs Wenker
|
c4a0fc30bb
|
fix not matching declaration/definition argument name
|
2020-04-23 00:58:49 +02:00 |
|
Thijs Wenker
|
b4362ea85a
|
move template functions to header
|
2020-04-23 00:58:49 +02:00 |
|