kasenvr
|
c7bcb03132
|
Merge pull request #438 from kasenvr/fix/prevent-cert-auto-remove
Disable Certified Entity Auto Deletion
|
2020-06-18 17:25:43 -04:00 |
|
kasenvr
|
63e3c001c3
|
Merge pull request #411 from Misterblue/fix/central-metaverse-urls
Move metaverse server URL info into central files for easier updating
|
2020-06-18 17:23:05 -04:00 |
|
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
|
a4c4e76274
|
Merge pull request #350 from ctrlaltdavid/feature/vive-pro-eye-tracking
Vive PRO Eye support
|
2020-06-18 17:10:37 -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 |
|
motofckr9k
|
256b466e84
|
Add vircadia-banner.svg for login dialogs
|
2020-06-18 09:12:01 +02:00 |
|
David Rowe
|
189f6f5440
|
Code review
|
2020-06-15 08:04:51 +12:00 |
|
David Rowe
|
4e57d53dde
|
Merge branch 'master' into feature/vive-pro-eye-tracking
|
2020-06-14 10:51:25 +12:00 |
|
kasenvr
|
f68810f766
|
Merge pull request #448 from kasenvr/v2020.2.1-rc
Merge 2020.2.1 into master
|
2020-06-13 16:28:25 -04:00 |
|
kasenvr
|
dbd06b1cfb
|
Merge pull request #444 from kasenvr/fix/ual-checkbox-default
Fix/ual checkbox default
|
2020-06-13 16:27:57 -04:00 |
|
Robert Adams
|
ef056ecfbd
|
Add another missing #include <stdexcept> for building under Windows.
|
2020-06-13 13:07:06 -07:00 |
|
Robert Adams
|
ad1825c2fb
|
Add "include <stdexcept>" so Storage.h builds under Windows.
This was accidentially removed because of interaction of several PRs.
|
2020-06-13 11:47:21 -07:00 |
|
Robert Adams
|
e8c245ca27
|
Merge branch 'fix/central-metaverse-urls' of github.com:Misterblue/project-athena into fix/central-metaverse-urls
|
2020-06-13 07:06:59 -07:00 |
|
Robert Adams
|
5ad1b5cf5a
|
Move metaverse server URL update: revert nearly all changes to
Javascript scripts because the 'require' of the central
definition file was not included.
|
2020-06-13 07:04:58 -07:00 |
|
Robert Adams
|
245b9b8036
|
Move metaverse server URL update: remove unnecessary spaces.
Remove added "include <stdexcept>" (for VS compiling) to separate PR.
|
2020-06-13 07:04:58 -07:00 |
|
Robert Adams
|
3878ad6df6
|
Move metaverse server URL info into NetworkingConstants.h (for C++
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
references to the new central definitions.
|
2020-06-13 07:04:58 -07:00 |
|
kasenvr
|
8b45d6b529
|
Merge pull request #445 from kasenvr/fix/readme-updates
Update README.md
|
2020-06-12 20:15:39 -04:00 |
|
kasenvr
|
099646cd66
|
Update README.md
|
2020-06-12 17:03:51 -04:00 |
|
kasenvr
|
54c0223808
|
Update README.md
|
2020-06-11 21:16:16 -04:00 |
|
Kasen IO
|
1575611082
|
Set UAL to disabled by default in the setting checkbox.
|
2020-06-11 20:14:14 -04: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
|
2ae304864e
|
Merge pull request #439 from kasenvr/fix/remove-goto
Remove old goto, update Explore app.
|
2020-06-11 17:24:48 -04:00 |
|
kasenvr
|
d52a21c515
|
Merge pull request #437 from kasenvr/fix/overlay-login-branding
Update login overlay to Vircadia.
|
2020-06-11 17:17:49 -04:00 |
|
kasenvr
|
a5bbd08f8e
|
Merge pull request #432 from ctrlaltdavid/feature/reduce-inspect-distance
Reduce minimum inspect distance
|
2020-06-11 17:17:04 -04:00 |
|
kasenvr
|
80fc2d8332
|
Merge pull request #426 from ctrlaltdavid/fix/wearables-text-unreadable
Fix visibility of values in Wearables dialog
|
2020-06-11 17:15:49 -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
|
fd59665e63
|
Add missing Prometheus stats to type map
|
2020-06-11 22:23:27 +02: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 |
|
Kasen IO
|
8a2b6fcb0a
|
Convert == to === in various places.
|
2020-06-10 19:18:25 -04:00 |
|
kasenvr
|
1d0cbe04c8
|
Update scripts/communityScripts/explore/explore.html
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
|
2020-06-10 19:16:49 -04:00 |
|
Kasen IO
|
05837d178a
|
Update Explore app to latest.
|
2020-06-10 13:33:33 -04:00 |
|
Kasen IO
|
6e7b3a387d
|
Remove old goto, update community-apps beta link.
|
2020-06-10 02:54:42 -04:00 |
|
Julian Groß
|
170c78e274
|
Delete unused athena-server.spec
|
2020-06-10 02:53:22 +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 |
|
Kasen IO
|
f6214d46d0
|
Add comments indicating intent.
|
2020-06-09 15:07:39 -04:00 |
|
Kasen IO
|
a75c43e073
|
Update login overlay to Vircadia.
|
2020-06-08 23:39:23 -04:00 |
|
Kasen IO
|
49f72f0ca6
|
1st pass at disabling certified auto-deletion.
|
2020-06-08 23:38:15 -04:00 |
|
Dale Glass
|
b2a5e7fdd1
|
Additional review fixes
|
2020-06-08 17:53:27 +02:00 |
|
kasenvr
|
585fb1939f
|
Merge pull request #429 from daleglass/upgrade_opus
Use newer opus to fix illegal instruction in libopusCodec.so
|
2020-06-07 22:54:53 -04:00 |
|
kasenvr
|
78f8e61575
|
Merge pull request #427 from kasenvr/feature/further-rebranding
Feature/further rebranding
|
2020-06-07 22:40:30 -04:00 |
|
Kasen IO
|
c55f365af4
|
Fix tablet login dialog logo size.
|
2020-06-07 20:47:53 -04:00 |
|
Kasen IO
|
c3337f6c32
|
Update interface and server-console icons.
|
2020-06-07 20:43:38 -04:00 |
|
Kasen IO
|
db1ff76ba5
|
Update installer/uninstall icons.
|
2020-06-07 17:15:11 -04:00 |
|
David Rowe
|
6df34d2a89
|
Reduce minimum inspect distance
|
2020-06-08 08:10:19 +12:00 |
|
kasenvr
|
69b6adc90c
|
Merge pull request #431 from ctrlaltdavid/fix/boilerplate
Remove path from boilerplate in coding standard
|
2020-06-07 15:50:25 -04:00 |
|
David Rowe
|
cf71c9b196
|
Update description
|
2020-06-08 07:47:41 +12:00 |
|