Commit graph

84280 commits

Author SHA1 Message Date
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
David Rowe
57016ded11 Fix up some corresponding InteractiveWindow JSDoc 2019-12-13 10:13:22 +13:00
David Rowe
3232f89a33 OverlayWindow and OverlayWebWindow JSDoc 2019-12-13 10:13:10 +13: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
HifiExperiments
5fc55d1763
Merge branch 'master' into cullFace 2019-12-11 00:49:58 -08:00
HifiExperiments
2eb0ec18fc fix non-procedural material entity crash 2019-12-11 00:42:59 -08:00
David Rowe
65bba26dfb EntityScriptServerLog API 2019-12-11 19:22:28 +13: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
David Rowe
92349706a9 Update WalletScriptingInteface JSDoc with links to ContextOverlay 2019-12-11 15:05:34 +13:00
David Rowe
febbd3a802 ContextOverlay JSDoc 2019-12-11 15:05:20 +13: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
Bradley Austin Davis
3a2d9b344e
Merge pull request #16569 from jherico/ga/enable_label_builds
Enable label based PR builds
2019-12-10 15:27:12 -08:00
Brad Davis
7dc7ce6e12 Enable label based PR builds 2019-12-10 15:22:50 -08: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
jennaingersoll
abcdf6bb25
Merge pull request #16567 from ctrlaltdavid/DOC-240
DOC-240: console JSDoc
2019-12-10 13:08:33 -08:00
Bradley Austin Davis
b4fc9c20ec
Merge pull request #16568 from jherico/ga/fix_s3
Fix GA S3 upload path
2019-12-10 12:45:31 -08:00
Brad Davis
1ac7215ac8 Fix GA S3 upload path 2019-12-10 12:44:49 -08:00
Bradley Austin Davis
270339264e
Merge pull request #16565 from SimonWalton-HiFi/linux-actions-builds-pr-builds
DEV-2572: Linux GHA PR builds
2019-12-10 12:35:38 -08:00
Bradley Austin Davis
d5540fbcf5
Merge pull request #16566 from sethalves/fix-disable-qml-on-linux
allow Linux interface to connect to domain when DISABLE_QML is true
2019-12-10 12:35:18 -08:00
David Rowe
4c1f7466d4 Typo 2019-12-11 09:31:29 +13:00
Simon Walton
9a87fe0473
Merge branch 'master' into linux-actions-builds-pr-builds 2019-12-10 11:37:25 -08:00
Simon Walton
4ff5db8c2f Merge master PR build (matrix for Win & Mac) 2019-12-10 11:35:11 -08:00
Bradley Austin Davis
b8018bdbe1
Merge pull request #16559 from jherico/ga/installer_debug
Dump installer logs on failure
2019-12-10 11:16:43 -08:00
David Rowe
bbd16d7544 Fix global print function's JSDoc 2019-12-11 07:42:58 +13:00
David Rowe
5caa21e5d9 Update Script JSDoc accordingly 2019-12-11 07:42:40 +13:00
David Rowe
7d2e818ab1 console JSDoc 2019-12-11 07:41:37 +13:00
Seth Alves
f97c3217a5 allow Linux interface to connect to domain when DISABLE_QML is true 2019-12-10 09:52:12 -08:00
Simon Walton
16b6c6305b Fix formatting issues in cmake file 2019-12-10 09:46:35 -08:00
Simon Walton
10d3bdde74 Don't build on label operatrions 2019-12-10 09:34:47 -08:00
Simon Walton
2be70c1b17 Revert master_build workflow to original 2019-12-09 17:09:46 -08:00
Kasen IO
297e039de5 Added a confirmation message + instructions to the QML. 2019-12-09 19:57:57 -05:00
David Rowe
73ad5d1d31 Fix some JSDoc typos noticed in passing 2019-12-10 13:34:32 +13:00
David Rowe
6750d02228 Rates JSDoc 2019-12-10 13:33:40 +13:00
jennaingersoll
6312a7cdd8
Merge pull request #16563 from ctrlaltdavid/DOC-198
DOC-198: OffscreenFlags JSDoc
2019-12-09 16:01:49 -08:00
jennaingersoll
6f44373141
Merge pull request #16556 from ctrlaltdavid/DOC-235
DOC-235: DriveKeys JSDoc
2019-12-09 15:58:31 -08:00
jennaingersoll
4f4bbb8304
Merge pull request #16561 from ctrlaltdavid/DOC-238
DOC-238: AddressManager JSDoc
2019-12-09 15:53:06 -08:00