Commit graph

81789 commits

Author SHA1 Message Date
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
kasenvr
1d14bed3ce
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
QML Whitelisting
2019-12-30 19:51:51 -05:00
3bb8498067
Merge pull request #39 from daleglass/fix_invoke_method_crash
Don't bind action if QML menu can't be added.
2019-12-30 18:23:08 -06:00
57f1773db5
Merge pull request #45 from kasenvr/fix/disable-auto-cmd
The command line no longer launches with interface.
2019-12-30 14:43:27 -06:00
kasenvr
00b97c74c2
Merge pull request #50 from daleglass/move_to_kasenvr_repos
Move to kasenvr repos
2019-12-30 14:33:10 -05:00
Dale Glass
ec86a1a57f Move to kasenvr repos
The highfidelity github repos will probably be going away on
Jan 15, 2020.
2019-12-30 20:24:15 +01:00
Kasen IO
0b66627eff The command line no longer launches with interface. 2019-12-29 23:48:32 -05:00
kasenvr
9dc7f54bfd
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-29 18:28:58 -05:00
kasenvr
8771f619ec
Merge pull request #32 from FluffyJenkins/bug/SecondaryCamCrash
Workaround for Secondary camera crash
2019-12-27 14:18:52 -05:00
Kasen IO
7489505f99 Updated whitelist info and name to include QML. 2019-12-26 22:27:58 -05:00
kasenvr
8c86b5fb98
Merge pull request #37 from Nex-Pro/patch-1
Update interface window title
2019-12-26 15:05:08 -05:00
Dale Glass
dabda684b8 Don't bind action if QML menu can't be added.
Otherwise eventually methods will be called on a NULL pointer.
Fixes crash related to QMetaObject::invokeMethod.
2019-12-26 01:04:53 +01:00
Kasen IO
683f790fc2 updated readme for cleanliness. 2019-12-24 19:42:10 -05:00
Nex-Pro
4856dd07fc
Update interface window title
Change window title from "High Fidelity" to "Project Athena"
2019-12-25 00:20:36 +00:00
acfda3ba49
Merge pull request #34 from vegaslon/document/buildnotes
Update a small portion of the build instructions
2019-12-21 15:28:10 -06:00
Thijs Wenker
b249f94528
Merge pull request #31 from FluffyJenkins/bug/BrokenAudioNoVR
Audio Failure Due to missing VR fix
2019-12-21 22:24:28 +01:00
Vegaslon
776b0ce75e Update a small portion of the build instructions to account for new branding and repository name. 2019-12-21 11:24:29 -05:00
Fluffy Jenkins
f6cfa7f364 Fixed something thats for sure 2019-12-20 01:04:10 +00:00
Fluffy Jenkins
6563d32395 Fixed something thats for sure 2019-12-20 00:57:38 +00:00
Fluffy Jenkins
ac9adc3dff
Update plugins/openvr/src/OpenVrHelpers.cpp
I screm

Co-Authored-By: Thijs Wenker <me@thoys.nl>
2019-12-20 00:00:17 +00:00
Fluffy Jenkins
9f3772093a
Its late 2019-12-19 23:54:34 +00:00
Fluffy Jenkins
a9ce336f6c
Made thoys happy by renaming a varible 2019-12-19 23:52:49 +00:00
Fluffy Jenkins
95c7998720 Changed code to correct type 2019-12-19 23:34:29 +00:00
Fluffy Jenkins
83e9b891d8 Workaround for Secondary camera crash 2019-12-19 23:31:10 +00:00
Fluffy Jenkins
7d402f4bae Changed so it will fail to load VR straight away instead of trying so much it causes audio failures 2019-12-19 23:19:05 +00:00
kasenvr
6b5d1c6191
Merge pull request #23 from MarcusLlewellyn/branding
Update Primary CMakeLists project name to Athena
2019-12-19 13:14:24 -05:00
b923c3f7f1 Update Primary CMakeLists project name to Athena
Having a "hifi.sln" file feels wrong. Let's fix that.
2019-12-18 17:33:35 -06:00
Fluffy Jenkins
0f3e8d2101 Made requested changes 2019-12-18 20:08:20 +00:00
kasenvr
b572b6595e
Merge pull request #19 from daleglass/kasen/core
Change asset URLs to Athena S3 bucket.
2019-12-18 14:34:11 -05:00
7858b29fbf
Removed trailing whitespace in CMakeLists.txt 2019-12-18 11:16:41 -06:00
Dale Glass
ac5a70fca0 Change asset URLs to Athena S3 bucket.
This uses a variable that can be overriden with an environment variable.
This makes it easy for the community to create alternate asset hosts.

Due to vcpkg using a clean environment, variables can't be easily passed
to cmake scripts run by vcpkg. This was worked around by writing the data
that needs to be passed into temporary files and reading it from the
vcpkg ports.
2019-12-18 17:36:01 +01:00
kasenvr
d9b202f4da
Merge pull request #15 from kasenvr/feature/sam+domainport
Feature/sam+domainport
2019-12-18 02:35:36 -05:00
fd05144590 fix sdl2 on sam+domains branch 2019-12-17 14:10:10 -06:00
44ddd82739
Merge pull request #21 from MarcusLlewellyn/kasen/core
Fix the fix for SDL2
2019-12-16 18:32:48 -06:00
51332b8437 Fix the fix for SDL2 2019-12-16 18:22:01 -06:00
kasenvr
00eb6e7d45
Merge pull request #20 from MarcusLlewellyn/sdl2-linux-fix
Update SDL2 CONTROL file to fix linux build
2019-12-16 18:27:27 -05:00
669c01c5a3 Update SDL2 CONTROL file to fix linux build 2019-12-16 17:21:16 -06:00
Kasen IO
d4c3504c8d Updated about dialog (old logo still there), application name, and readme.md 2019-12-14 23:12:54 -05:00
Fluffy Jenkins
82dc6d197a New feature 2019-12-14 03:02:13 +00:00
Kasen IO
1f01beba70 Fixed patch issues 2019-12-13 12:29:08 -05:00
kasenvr
bbf0a92be2
Update BUILD_WIN.md
Changed link from HiFi repo to ours.
2019-12-13 09:45:46 -05:00
Kasen IO
9839b23061 Made Sam's graphics patches work with 86 K2. 2019-12-13 02:38:14 -05:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
Maki
a7851c9205 Fixed type conversions for environmental domain ports
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
Maki
1ef45b703c Added environment variables to change domain server ports
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
HifiExperiments
204c7a7391 fix shadows!! 2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
SamGondelman
398562321d fix wearables not disappearing with avatar 2019-12-12 23:02:57 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00