Commit graph

81858 commits

Author SHA1 Message Date
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
HifiExperiments
59c67e5590 put back stepping in translucent case 2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32 properly implement alphaModes 2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a put back stepping in translucent case 2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554 properly implement alphaModes 2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -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