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
bbf0a92be2
Update BUILD_WIN.md
...
Changed link from HiFi repo to ours.
2019-12-13 09:45:46 -05:00
7f56c090f8
Merge pull request #13 from kasenvr/revert-12-features/default-scripts
...
Revert "Adds community script directory, adds chat as default app."
2019-12-12 11:12:19 -06:00
c08e1a227c
Revert "Adds community script directory, adds chat as default app."
2019-12-12 11:10:01 -06:00
kasenvr
44f50265cf
Merge pull request #12 from MarcusLlewellyn/features/default-scripts
...
Adds community script directory, adds chat as default app.
2019-12-11 13:52:11 -05:00
67dca7639f
Adds community script directory, adds chat as default app.
...
This adds a community directory under the scripts directory. George Deacon's chat app has been placed within, and is loaded as a default script.
2019-12-11 12:25:43 -06:00
Kasen IO
eaab6e4330
Merge branch 'kasen/core' of https://github.com/kasenvr/hifi-community into kasen/core
2019-12-11 11:04:25 -05:00
Kasen IO
5a675c6a06
Updated for K2 features, whitelist instructions, & build instructions.
2019-12-11 11:03:56 -05:00
kasenvr
53272462ab
Merge pull request #10 from MarcusLlewellyn/fixes/easy-shaders
...
Removes the environment variable requirement for procedural material shaders
2019-12-11 10:59:01 -05:00
kasenvr
ca3af76081
Merge pull request #11 from MarcusLlewellyn/fixes/kasen-icon
...
Replace the interface icons with Kasen logo icon.
2019-12-11 10:45:55 -05:00
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
