Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3def7d0
Add setup video
jellejurre Sep 24, 2023
6f7251c
Add preview gif
jellejurre Nov 7, 2023
e2f66f4
Made gif loop
jellejurre Nov 9, 2023
dfb3391
Merge pull request #6 from VRLabs/feature/cleanup
hfcRed Nov 13, 2023
fcf0dc3
Remove line at the bottom
jellejurre Nov 14, 2023
d1fab6c
Merge pull request #9 from VRLabs/feature/cleanup
Cibbi Nov 14, 2023
30d0e77
Re-add bottom line (this was an error)
jellejurre Nov 22, 2023
ff004e9
Merge pull request #11 from VRLabs/feature/cleanup
jellejurre Nov 22, 2023
9590e53
Updated README
hfcRed Nov 26, 2023
ae9801c
Merge pull request #12 from VRLabs/feature/cleanup
hfcRed Nov 26, 2023
e6c5fc8
Rename name in license
jellejurre Nov 27, 2023
f1f4147
Merge pull request #13 from VRLabs/feature/cleanup
jellejurre Nov 27, 2023
7a18564
Merge pull request #17 from VRLabs/main
jellejurre Dec 15, 2023
ba4e1a9
Move Culling Cube to UIMenu and make it always expand
jellejurre Dec 15, 2023
bff5917
add package.json and new workflow
Cibbi Dec 15, 2023
245ae04
fix dependencies
Cibbi Dec 15, 2023
5756335
added license in package.json
Cibbi Dec 15, 2023
ebda700
Add preview Media
jellejurre Dec 25, 2023
68f4d7b
Fix typo
jellejurre Dec 29, 2023
5c7cc0a
Link raw media
jellejurre Dec 29, 2023
a8a0d75
Move to webp
jellejurre Feb 19, 2024
bbb70fb
Commit meta files
jellejurre Feb 19, 2024
77040bc
Loop webp
jellejurre Feb 19, 2024
c5beb2e
Add vcc link to readme
jellejurre Feb 26, 2024
a682e1c
Merge pull request #18 from VRLabs/feature/vcc-support
jellejurre Feb 26, 2024
bd3a568
Merge pull request #16 from VRLabs/fix/fix-culling-cube
jellejurre Feb 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions .github/workflows/VRC-Asset-Release-And-Upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: VRC Asset Release and Listing Upload
on:
push:
tags:
- "*.*.*"

env:
ASSETS_PATH: .
RELEASE_PATH: Packages
ARTIFACT_DURATION: 30 # In days
UPLOAD_ENDPOINT: https://api.vrlabs.dev/packages/add
WORKFLOW_VERSION: 1.0.0

jobs:
build:
runs-on: "ubuntu-latest"
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Check if package.json exists
run: |
if [ ! -f package.json ]; then
echo "package.json not found"
exit 1
fi

- name: Get package.json
id: get_package_json
run: |
{
echo 'package_json<<"""'
echo $(cat package.json)
echo '"""'
} >> $GITHUB_OUTPUT

- name: Get needed Data
id: job_data
run: |
version=$(echo "${{ github.ref_name }}")
version=$(echo $version | tr '[:upper:]' '[:lower:]')
echo "version=$version" >> $GITHUB_OUTPUT
major_version=$(echo $version | cut -d '.' -f 1)
minor_version=$(echo $version | cut -d '.' -f 2)
echo "major_version=$major_version" >> $GITHUB_OUTPUT
echo "minor_version=$minor_version" >> $GITHUB_OUTPUT
name="${{ fromJson(steps.get_package_json.outputs.package_json).name }}"
display_name="${{ fromJson(steps.get_package_json.outputs.package_json).displayName }}"
echo "package_name=$name" >> $GITHUB_OUTPUT
echo "package_display_name=$display_name" >> $GITHUB_OUTPUT

- name: Create Packages
id: create_packages
uses: VRLabs/VRCTools-Packaging-Action@v1
with:
path: '${{ env.ASSETS_PATH }}'
outputPath: '${{ env.RELEASE_PATH }}'
releaseUrl: 'https://github.com/${{ github.repository }}/releases/download/${{ steps.job_data.outputs.version }}/${{ steps.job_data.outputs.package_name }}-${{ steps.job_data.outputs.version }}.zip'
unityReleaseUrl: 'https://github.com/${{ github.repository }}/releases/download/${{ steps.job_data.outputs.version }}/${{ steps.job_data.outputs.package_name }}-${{ steps.job_data.outputs.version }}.unitypackage'
releaseVersion: '${{ steps.job_data.outputs.version }}'

- name: Create Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
name: "${{ steps.job_data.outputs.package_display_name }} ${{ steps.job_data.outputs.version }}"
files: |
${{ steps.create_packages.outputs.unityPackagePath }}
${{ steps.create_packages.outputs.vccPackagePath }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SOURCE_TAG: ${{ steps.job_data.outputs.version }}

- name: Add server-json to Artifacts
uses: actions/upload-artifact@v3
with:
name: server-json
path: ${{ steps.create_packages.outputs.serverPackageJsonPath }}
retention-days: ${{ env.ARTIFACT_DURATION }}

- name: Send package info to a server
run: |
curl -X POST -H "Content-Type: application/json" -H "Vrl-Api-Key: ${{ secrets.LISTINGS_API_KEY }}" --data @${{ steps.create_packages.outputs.serverPackageJsonPath }} ${{ env.UPLOAD_ENDPOINT }} || exit 0
shell: bash
45 changes: 0 additions & 45 deletions .github/workflows/create-release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 VRLabs
Copyright (c) 2022 VRLabs LLC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Binary file modified Media/Preview.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Media/Preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Media/Setup.mp4
Binary file not shown.
Binary file added Media/Web/Preview.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions Media/Web/Preview.webp.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Media/Web/PreviewGif.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions Media/Web/PreviewGif.webp.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 32 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
<div align="center">

# Marker

[![Generic badge](https://img.shields.io/badge/Unity-2019.4.31f1-informational.svg)](https://unity3d.com/unity/whats-new/2019.4.31)
[![Generic badge](https://img.shields.io/badge/SDK-AvatarSDK3-informational.svg)](https://vrchat.com/home/download)
[![Generic badge](https://img.shields.io/badge/License-MIT-informational.svg)](https://github.com/VRLabs/Marker/blob/main/LICENSE)
[![Generic badge](https://img.shields.io/github/downloads/VRLabs/Marker/total?label=Downloads)](https://github.com/VRLabs/Marker/releases/latest)
[![Generic badge](https://img.shields.io/badge/License-MIT-informational.svg)](https://github.com/VRLabs/Marker/blob/main/LICENSE)
[![Generic badge](https://img.shields.io/badge/Unity-2019.4.31f1-lightblue.svg)](https://unity3d.com/unity/whats-new/2019.4.31)
[![Generic badge](https://img.shields.io/badge/SDK-AvatarSDK3-lightblue.svg)](https://vrchat.com/home/download)

[![Generic badge](https://img.shields.io/discord/706913824607043605?color=%237289da&label=DISCORD&logo=Discord&style=for-the-badge)](https://discord.vrlabs.dev/)
[![Generic badge](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dvrlabs%26type%3Dpatrons&style=for-the-badge)](https://patreon.vrlabs.dev/)

A marker for drawing

![Marker-Draw](https://github.com/VRLabs/Marker/assets/76777936/e64f034a-f2a5-467a-b698-b383164e5422)
![Marker-Remove](https://github.com/VRLabs/Marker/assets/76777936/a6c657d3-19e1-4e59-950b-bf6d63096fd6)

### ⬇️ [Download Latest Version](https://github.com/VRLabs/Marker/releases/latest)

A marker for drawing.

<div>
<img src="https://raw.githubusercontent.com/VRLabs/Marker/main/Media/Main.jpeg" width="100%">
<br/>
### 📦 [Add to VRChat Creator Companion](https://vrlabs.dev/packages?package=dev.vrlabs.marker)

</div>

---

## How it works

The "Draw" particle system emits particles for drawing. The "Eraser" collider kills the particles. Particles are emitted in a custom simulation space so the drawing can be manipulated.
Expand All @@ -30,18 +42,24 @@ When finished adjusting MarkerTarget, copy its transform component to paste its

Click "Finish Setup" to finalize your marker and remove the script from your avatar.

## Credit
## Contributors

[ksivl](https://github.com/ksivl)

## Downloads

You can grab the latest version of the Marker in [Releases](https://github.com/VRLabs/Marker/releases/latest).

## License

Marker is available as-is under MIT. For more information see [LICENSE](https://github.com/VRLabs/Marker/blob/main/LICENSE).

## Contact us

If you need help, our support channel is on [Discord](https://discord.vrlabs.dev).
<div align="center">

[<img src="https://github.com/VRLabs/Resources/raw/main/Icons/VRLabs.png" width="50" height="50">](https://vrlabs.dev "VRLabs")
<img src="https://github.com/VRLabs/Resources/raw/main/Icons/Empty.png" width="10">
[<img src="https://github.com/VRLabs/Resources/raw/main/Icons/Discord.png" width="50" height="50">](https://discord.vrlabs.dev/ "VRLabs")
<img src="https://github.com/VRLabs/Resources/raw/main/Icons/Empty.png" width="10">
[<img src="https://github.com/VRLabs/Resources/raw/main/Icons/Patreon.png" width="50" height="50">](https://patreon.vrlabs.dev/ "VRLabs")
<img src="https://github.com/VRLabs/Resources/raw/main/Icons/Empty.png" width="10">
[<img src="https://github.com/VRLabs/Resources/raw/main/Icons/Twitter.png" width="50" height="50">](https://twitter.com/vrlabsdev "VRLabs")

</div>
Loading