Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Omnibus PR with fixes for #333, #334, #335, and README updates #340

Merged
merged 26 commits into from
Mar 23, 2022
Merged

Omnibus PR with fixes for #333, #334, #335, and README updates #340

merged 26 commits into from
Mar 23, 2022

Commits on Jan 28, 2022

  1. begin work on #300 #332

    @kerfuffles
    kerfuffles committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    a13fac2 View commit details
    Browse the repository at this point in the history

  2. convert icons to embedded equivalents, fix icon path issues when RCSG… 

    … is moved from Assets/Plugins

a data generator was used to create EmbeddedAssets. To update any icons should the need arise, one would just simply run the generator again to update it. (see Icon2EmbeddedAssetUtility). Icon2EmbeddedAssetUtility should(tm) find the correct folder automatically when generating icons. All one needs to do is place the icons in the Resources/Icons folder
    @kerfuffles
    kerfuffles committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    4286ffe View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @kerfuffles
    kerfuffles authored Jan 28, 2022
    Configuration menu
    Copy the full SHA
    5a3c938 View commit details
    Browse the repository at this point in the history

  4. Update Icon2EmbeddedAssetsUtility.cs

    @kerfuffles
    kerfuffles committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    7503c49 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'remove-unity-project' of https://github.com/Kerfuffles/… 

    …realtime-CSG-for-unity into remove-unity-project
    @kerfuffles
    kerfuffles committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    75539a7 View commit details
    Browse the repository at this point in the history

  6. Update Icon2EmbeddedAssetsUtility.cs

    @kerfuffles
    kerfuffles committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    71e9eb2 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. (not working yet) work on fixing material/physic material loading, ig… 

    …nore meta for readme, etc
    @kerfuffles
    kerfuffles committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    3bb23b6 View commit details
    Browse the repository at this point in the history

  2. revert material utility changes

    @kerfuffles
    kerfuffles committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    e6c78fd View commit details
    Browse the repository at this point in the history

  3. fix missing materials, and account for RCSG folder being moved when g… 

    …enerating RP materials.

instead of using the shader name to generate folders, it now uses URP and HDRP respectively (based on the default shader present in the RP) when creating RP materials, to reduce folder structure depth. additionally, RCSG now uses an assembly definition, which is used to locate RCSG when locating assets.
    @kerfuffles
    kerfuffles committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    0f1b593 View commit details
    Browse the repository at this point in the history

  4. add package.json

    @kerfuffles
    kerfuffles committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    577e650 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. update to fix versions of unity back to 5.6.4f1

    @kerfuffles
    kerfuffles committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    4fcd236 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2022

  1. Convert project to Plugins/ folder only (#333)

    @kerfuffles
    kerfuffles authored Feb 11, 2022
    Configuration menu
    Copy the full SHA
    4da15ba View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2022

  1. fix inability to build player due to a missed setting in .asmdef

    @kerfuffles
    kerfuffles committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    f96ce46 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into remove-unity-project

    @kerfuffles
    kerfuffles committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    396ea85 View commit details
    Browse the repository at this point in the history

  3. Fix inability to build player due to missed setting in .asmdef (#334)

    @kerfuffles
    kerfuffles authored Feb 12, 2022
    Configuration menu
    Copy the full SHA
    342bb1c View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2022

  1. Merge branch 'LogicalError:master' into remove-unity-project

    @kerfuffles
    kerfuffles authored Feb 13, 2022
    Configuration menu
    Copy the full SHA
    3a7cfab View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2022

  1. Update readme, use folder search for RCSG root instead of file search… 

    …, fix player build issue
    @kerfuffles
    kerfuffles committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    d36aad8 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. bring changes over from #341 to resolve merge conflicts

    @kerfuffles
    kerfuffles committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    a659a08 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @kerfuffles
    kerfuffles committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    f19816b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix-player-build

    @kerfuffles
    kerfuffles committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    e0b0c2a View commit details
    Browse the repository at this point in the history

  4. include missed step in readme for updating manually

    @kerfuffles
    kerfuffles committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    9f21056 View commit details
    Browse the repository at this point in the history

  5. fix folder search not working when installed as a package 

    Some paths were hardcoded to use `Assets/`. This fixes that, and should now function identically from `Assets/` or `Packages/`
    @kerfuffles
    kerfuffles committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    9f277b6 View commit details
    Browse the repository at this point in the history

  6. Update README.md 

    fixed some wording that was incorrect
    @kerfuffles
    kerfuffles authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    fe462f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. update package version

    @kerfuffles
    kerfuffles committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    f1eee0c View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2022

  1. (hopefully) fix broken import with render pipelines

    @kerfuffles
    kerfuffles committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    f62109d View commit details
    Browse the repository at this point in the history

  2. include changes missed due to project not being saved

    @kerfuffles
    kerfuffles committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    13ed86a View commit details
    Browse the repository at this point in the history