Commit graph

84280 commits

Author SHA1 Message Date
f93e47cfcd Merge branch 'opus-plugin' of https://github.com/MarcusLlewellyn/project-athena into opus-plugin 2020-01-15 13:51:12 -06:00
9a67ee19e0 More review fixes since I missed 66 of them. 2020-01-15 13:49:25 -06:00
d96da21dd7
Update plugins/opusCodec/src/OpusDecoder.cpp
Co-Authored-By: Thijs Wenker <me@thoys.nl>
2020-01-15 13:06:42 -06:00
0a3dfdefce
Update plugins/opusCodec/src/plugin.json
Co-Authored-By: Thijs Wenker <me@thoys.nl>
2020-01-15 13:05:43 -06:00
5ff8654363
Update plugins/opusCodec/src/plugin.json
Co-Authored-By: Thijs Wenker <me@thoys.nl>
2020-01-15 13:04:59 -06:00
24669c98f6 Made changes requested by reviewer
Fixed missing copyright headers.
Fixed exceeding 120 columns.
Fixed #include
Fixed if conditional style.
Fixed C++ reference symbol placement.
2020-01-15 12:57:18 -06:00
NexPro
e15c135dc5 Merge remote-tracking branch 'remotes/origin/kasen/core' into kasen/core 2020-01-15 18:34:09 +00:00
597f88cc7d
Merge pull request #94 from MarcusLlewellyn/kasen/core
Quick fix for the metaverse API
2020-01-14 20:35:04 -06:00
6ac090dea5 Quick fix for the metaverse API
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
2020-01-14 20:33:39 -06:00
Maia Hansen
26aa047b02
Merge pull request #16582 from hd23408/master
Switching Windows builds over to a self-hosted runner
2020-01-14 18:17:44 -08:00
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0
fix linux build
2020-01-14 18:44:01 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
Maia Hansen
e4acc18234 Switching Windows builds to self-hosted 2020-01-14 16:04:39 -08:00
f23dfc7d0d Cleanup some kruft.
Removed some unecessary files, defines, and includes.
2020-01-14 17:41:55 -06:00
Dale Glass
830f3ab337 Instrument HifiAC code with performance timers
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-14 16:58:05 -06:00
Dale Glass
391f3accc6 Instrument HifiAC code with performance timers 2020-01-14 23:20:24 +01:00
Dale Glass
8f65a90453 Remove getRaw() from DepthTest
State::getKey removed because it breaks and is not referenced from anywhere.
2020-01-14 23:00:08 +01:00
2a3b117f5d
Merge pull request #64 from ctrlaltdavid/feature/inspect
inspect.js improvements
2020-01-14 12:35:35 -06:00
653b333060
Merge pull request #85 from kasenvr/fix/obsolete-apps
Removed obsolete default scripts + more branding changes.
2020-01-14 12:33:30 -06:00
8d35d48b13
Merge pull request #88 from FluffyJenkins/feature/communityModules
Added /l /d /g chatbar switches and /goto and /me
2020-01-14 12:32:22 -06:00
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
David Rowe
050c6e2cc5 Merge branch 'DOC-212' into api-docs
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
2020-01-14 18:04:17 +13:00
David Rowe
b9a1b78531 Merge branch 'DOC-68' into api-docs
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
2020-01-14 18:02:23 +13:00
David Rowe
3e1c76e309 Merge branch 'DOC-55-B' into api-docs 2020-01-14 17:59:25 +13:00
HifiExperiments
c45ee33e97 review comment 2020-01-13 17:44:32 -08:00
NexPro
203c371a01 Re-branding of help dialogs and tablet login 2020-01-14 00:33:29 +00:00
kasenvr
b2648a0624
Merge pull request #89 from ctrlaltdavid/disable-api-docs-analytics
Disable API docs old analytics
2020-01-13 19:01:58 -05:00
Fluffy Jenkins
64149af8ce Fixed goto to go to in dialog I HOPE YOU'RE HAPPY KALILA ;w; 2020-01-13 23:54:57 +00:00
David Rowe
195f8867d8 Disable API docs old analytics 2020-01-14 12:48:16 +13:00
Fluffy Jenkins
ae620b78af Added /l /d /g chatbar switches and /goto 2020-01-13 23:45:38 +00:00
kasenvr
a297d7d735
Update BUILD_WIN.md
Added pip install distro command step.
2020-01-13 18:01:48 -05:00
David Rowe
681bd3cb1e Fix inspect not working after change camera mode 2020-01-14 11:34:16 +13:00
6a294404c2 fix marcus being very stoopid 2020-01-13 15:44:46 -06:00
c714d2d417 Merge remote-tracking branch 'upstream/kasen/core' into opus-plugin 2020-01-13 13:36:16 -06:00
3a5059a613 Re-enable hifiAC and pcmCodec projects
These has been disabled for testing purpose. They are now restored.
2020-01-13 13:35:36 -06:00
Thijs Wenker
26bebba8dd fix opus library linking in cmake
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-13 12:27:24 -06:00
kasenvr
1133f51971
Merge pull request #70 from Nex-Pro/kasen/core
Rebranding of login dialogs etc. QML
2020-01-13 09:42:09 -05:00
kasenvr
a3415750a9
Merge pull request #75 from MarcusLlewellyn/fixes/help-menu
Redo the interface's help menu for Project Athena.
2020-01-13 09:28:04 -05:00
kasenvr
9fb3662dce
Merge pull request #53 from daleglass/remove_deprecated_linux_distribution
Add support for Ubuntu 19.10, modernize vcpkg
2020-01-13 08:15:26 -05:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
0022170400 Fix minor cmake oopsie. 2020-01-12 18:33:46 -06:00
b2d15a38e9 Merge remote-tracking branch 'upstream/kasen/core' into opus-plugin 2020-01-12 18:23:36 -06:00
2b8c0ffbdc Merge branch 'daleglass/opus-plugin' into opus-plugin 2020-01-12 18:18:14 -06:00
Dale Glass
1e34a59c6b Add python3-distro to list of required Linux packages
Also changed python3.6 to python, because "python3.6" doesn't work on Ubuntu 19.10,
but "python3" works everywhere.
2020-01-12 21:22:03 +01:00
Dale Glass
47043766f3 Remove usage of deprecated platform.linux_distribution()
Also, make error reporting slightly friendlier, and add experimental
support for Ubuntu 19.10.
2020-01-12 21:11:07 +01:00
Dale Glass
b8a6ee3256 Unpack files with any kind of supported compression, not just gzip 2020-01-12 21:11:07 +01:00
kasenvr
7abb8347ca
Update BUILD_LINUX.md
fixed a space
2020-01-12 15:02:56 -05:00
kasenvr
43e9db3c2c
Merge pull request #47 from temcom/kasen/core
Adapting some linux entries
2020-01-12 15:01:39 -05:00
7584429e77
Remove reference to Mint 2020-01-12 13:47:40 -06:00
96dc01fcc6 Made requested changes to About dialog.
Removed dash from "open source"
Fixed missing and unecessary periods.
2020-01-12 12:47:17 -06:00