Commit graph

81926 commits

Author SHA1 Message Date
e098dbda7f Change interface icons to Kasen logo.
We probably don't want to continue with High Fidelity's "voxel" icon for the interface. This changes them to the Kasen logo.
Tested on:
Windows 10 Pro 1909 build 18363.476
CMake 3.16.0
Microsoft Visual Studio Community 2019 Version 16.4.0
2019-12-11 09:21:43 -06:00
kasenvr
b470a765aa
Merge pull request #9 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-10 21:10:06 -05:00
kasenvr
27debcc219
Update INSTALL.md 2019-12-10 20:12:17 -05:00
kasenvr
2ba680fcf1
Update INSTALL.md
typo
2019-12-10 20:11:52 -05:00
kasenvr
bf54782ca7
Update INSTALL.md
Added an interim step for server-console-npm, worked for Darling, untested by any others so far.
2019-12-10 20:07:51 -05:00
af4c0ea0d1 Removes the environment variable requirement for procedural material shaders.
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2019-12-10 16:52:19 -06:00
kasenvr
aa911f3c27
Merge pull request #7 from kasenvr/feature/whitelist-qml-cpp-ui
Added a confirmation message + instructions to the QML.
2019-12-10 17:02:25 -05:00
Kasen IO
297e039de5 Added a confirmation message + instructions to the QML. 2019-12-09 19:57:57 -05:00
6f2d6ba714
Merge pull request #6 from kasenvr/feature/whitelist-qml-cpp-ui
Fixes Entity Script Whitelist
2019-12-09 17:18:29 -06:00
Kasen IO
68443f878b Update Application.cpp
updated application name.
2019-12-09 18:06:33 -05:00
Kasen IO
3e6660b633 Updated whitelist debugs for clarity in dev log 2019-12-09 08:30:02 -05:00
Kasen IO
2de388ab3b Fixes bug where empty "" whitespace allows all scripts. 2019-12-09 01:20:04 -05:00
Kasen IO
5fe27cdfc9 Added github link to about 2019-12-08 23:50:09 -05:00
kasenvr
858b056803
Merge pull request #5 from kasenvr/feature/whitelist-qml-cpp-ui
scriptengine pulls from inferface.json correctly, removed extra debug…
2019-12-08 23:19:26 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
kasenvr
3eca25ab0c
Merge pull request #1 from kasenvr/feature/whitelist-qml-cpp-ui
Whitelist added to interface.json, accessed by QML and C++
2019-12-08 21:19:26 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
bc17febb3f updated Readme.MD for new whitelist instructiosn 2019-12-08 21:05:16 -05:00
kasenvr
cde3566690
Merge pull request #3 from kasenvr/kasen/core
Upgrade kcpkg port files from SDL2 from 2.0.8 to 2.0.10. This fixes patch issues.
2019-12-08 17:34:04 -05:00
12e5712f41 Upgrade vcpkg port files for SDL2 from 2.0.8 to 2.0.10. Fixes patch errors.
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2019-12-08 09:46:58 -06:00
kasenvr
905189d602
Merge pull request #2 from kasenvr/fixes/git-ignore
ignores "VideoDecodeStats" in .gitignore
2019-12-07 22:32:37 -05:00
Kasen IO
3c8f76b3f9 ignores "VideoDecodeStats" in .gitignore 2019-12-07 22:26:31 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Kasen IO
6976939ff4 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-04 13:42:20 -05:00
Kasen IO
245224f0e9 Updated readme.md again + updated application title again. 2019-12-04 13:39:22 -05:00
Kasen IO
2cf453432e Updated readme.md + updated application title. 2019-12-04 11:50:01 -05:00
Kasen IO
4daa9abd84 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-03 13:17:11 -05:00
Kasen IO
3be39e514d updated readme.md again 2019-12-03 13:15:50 -05:00
Kasen IO
fbb5d448cd Added "why HiFi" to readme.md 2019-12-03 11:51:59 -05:00
Kasen IO
3ca678bf28 Updated readme's to latest. 2019-12-03 11:26:05 -05:00
Kasen IO
166ee8560a Updated readme.md to add goal v1. 2019-12-03 11:08:11 -05:00
Kasen IO
210c509c2b Updated readme.md 2019-12-03 10:48:09 -05:00
Kasen IO
268112ffaf HiFi readme moved aside, new readme inserted 2019-12-03 10:30:06 -05:00
Kasen IO
edfce861a8 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681 Removed all hardcoded whitelist rules 2019-12-01 22:55:51 -05:00
Kasen IO
94df2c304b Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:08:45 -05:00
Kasen IO
b24cc3658c Update CMakeLists.txt
re-added oculus plugins to cmakelists.txt
2019-12-01 22:08:26 -05:00
Kasen IO
165eb16f93 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 20:04:32 -05:00
Kasen IO
872a0b4496 Updated application version to 86. 2019-12-01 20:04:00 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
Shannon Romano
f38509dad5
Merge pull request #16489 from hyperlogic/bug-fix/hmd-strafe-transition-bug-rc86
RC86: Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states
Force merge due to build issues.
2019-11-13 12:48:11 -08:00
DouglasWilcox
a3de25618a Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
(cherry picked from commit f9f28fc286)
2019-11-13 09:52:56 -08:00
Kalila R
7c1b9e79ae Setting ModelBaker.cpp back to main. 2019-11-11 20:28:16 -05:00
Kalila R
5f7486fe7e Setting DomainBaker.cpp back to main. 2019-11-11 20:26:26 -05:00
Kalila R
a7b2c3a32c Updated application name and version. 2019-11-11 20:22:19 -05:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
Shannon Romano
b14c1ee331
Merge pull request #16471 from samcake/v0860
DEV-2711: Fix with procedural material and shadows applied on deformed mesh
2019-11-08 10:25:10 -08:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f Fixing bug with custom pipeline and deformed shape renderItems in shadow pass 2019-11-07 15:16:11 -08:00
Shannon Romano
10a1ee24e8
Merge pull request #16462 from zfox23/removeHomeIcon
DEV-2701: Remove the home icon from the profile app
2019-11-06 15:34:18 -08:00