Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 73230b7f49a26063c6a19c6401c49f172863d6d7
Merge: 1c286c4f e1f5d22a
Author: colinator27 <[email protected]>
Date:   Mon Dec 2 13:32:38 2024 -0500

    Merge branch 'master' into underanalyzer

commit 1c286c4f7f7b8f22df1bc74d676f014cae690f7c
Author: colinator27 <[email protected]>
Date:   Mon Dec 2 13:32:23 2024 -0500

    Update Underanalyzer

commit e1f5d22aadd358b748c4ba785d0c647383064dbf
Author: colinator27 <[email protected]>
Date:   Mon Dec 2 12:12:01 2024 -0500

    Revert debug constant defined for nightly builds

commit 51ebf7f43f6fd7f09abd6b59f6640b1e78398970
Merge: cbb70cab 35dca46e
Author: Miepee <[email protected]>
Date:   Mon Dec 2 08:33:32 2024 +0100

    Merge pull request #1908 from UnderminersTeam/replace-webclient

    Replace WebClient with HttpClient

commit 35dca46ef61793d0ab88568fae902a81804d40a8
Author: colinator27 <[email protected]>
Date:   Sun Dec 1 19:11:12 2024 -0500

    Remove try/catch around progress status update

commit cbb70cabbf6e31c0cd5fccc6be72c5a3e098d137
Merge: 68f06d77 d0a807d0
Author: Miepee <[email protected]>
Date:   Mon Dec 2 00:53:37 2024 +0100

    Merge pull request #1893 from UnderminersTeam/nightly-debug-fix

    Manually add DEBUG constant to nightly builds

commit d0a807d04008d601bfa5a6c6ee8c39b1f8ceeefa
Author: colinator27 <[email protected]>
Date:   Sun Dec 1 18:47:37 2024 -0500

    Add comment regarding debug macro

commit 256c6b6e4ba5fcad7049f3da19411677f6d84b4b
Author: colinator27 <[email protected]>
Date:   Sun Dec 1 18:40:12 2024 -0500

    Address some reviews

commit 282ecca341d1867f73f81e97066a65cf94a199d2
Merge: 989a173f 68f06d77
Author: colinator27 <[email protected]>
Date:   Sun Dec 1 18:21:16 2024 -0500

    Merge branch 'master' into underanalyzer

commit 989a173fd6a8e56080304a70cc618c9c042a9301
Author: colinator27 <[email protected]>
Date:   Sun Dec 1 18:02:50 2024 -0500

    Update UA to add local var declaration cleanup

commit 68f06d77d7cd331c7ec4b39cf32ec061634d8271
Merge: b8587ce7 7c2cd83d
Author: Miepee <[email protected]>
Date:   Sun Dec 1 16:02:47 2024 +0100

    Merge pull request #1985 from UnderminersTeam/copy-on-write-flag

    Add EnableCopyOnWrite flag

commit b8587ce7feb4aa6b5943be0c7a516b10c2e8ecf7
Merge: 0ca898a5 54968e3e
Author: Miepee <[email protected]>
Date:   Sun Dec 1 16:01:53 2024 +0100

    Merge pull request #1947 from zivmaor/find-references-crash-fix

    Find references crash fix

commit 7c2cd83dde5f509015ed25d56c80cc96ed18624b
Author: colinator27 <[email protected]>
Date:   Sat Nov 30 11:48:31 2024 -0500

    Add EnableCopyOnWrite flag

commit 0ca898a5afdc87f98dbb081aeed1f6905583f865
Merge: f1e6da3d 54c52be7
Author: Miepee <[email protected]>
Date:   Fri Nov 29 13:48:41 2024 +0100

    Merge pull request #1983 from UnderminersTeam/dependabot/nuget/xunit-2.9.2

    Bump xunit from 2.9.0 to 2.9.2

commit f1e6da3d2dd6e066d7b670f6ccb9e149cc7bcb70
Merge: 8626c6ec a1fadae6
Author: Miepee <[email protected]>
Date:   Fri Nov 29 13:48:25 2024 +0100

    Merge pull request #1963 from luizzeroxis/fix-2024-6-masks

    Fix 2024.6 masks not showing

commit a1fadae6ab0e231a5766aa901f1f7030eea91e35
Author: luizzeroxis <[email protected]>
Date:   Thu Nov 28 21:38:08 2024 -0300

    Add XML documentation to Width and Height of MaskEntry

commit 54c52be7a57308f828cfb6b2088c04d575175a8c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Nov 28 02:53:22 2024 +0000

    Bump xunit from 2.9.0 to 2.9.2

    Bumps [xunit](https://github.com/xunit/xunit) from 2.9.0 to 2.9.2.
    - [Commits](https://github.com/xunit/xunit/compare/v2-2.9.0...v2-2.9.2)

    ---
    updated-dependencies:
    - dependency-name: xunit
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 8626c6ec75301f105a3d76246adf4cbc74cd9391
Merge: 5238dd16 ce0dfd58
Author: Miepee <[email protected]>
Date:   Wed Nov 27 09:40:54 2024 +0100

    Merge pull request #1982 from UnderminersTeam/dependabot/nuget/Microsoft.Windows.Compatibility-9.0.0

    Bump Microsoft.Windows.Compatibility from 5.0.2 to 9.0.0

commit ce0dfd585932af39623ad1567a838a245d81ca96
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 27 08:33:23 2024 +0000

    Bump Microsoft.Windows.Compatibility from 5.0.2 to 9.0.0

    Bumps [Microsoft.Windows.Compatibility](https://github.com/dotnet/windowsdesktop) from 5.0.2 to 9.0.0.
    - [Release notes](https://github.com/dotnet/windowsdesktop/releases)
    - [Commits](https://github.com/dotnet/windowsdesktop/compare/v5.0.2...v9.0.0)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.Windows.Compatibility
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 5238dd1664f203021cfbcbed4b513116bd79434f
Merge: 5bbc2576 0ee9d276
Author: Miepee <[email protected]>
Date:   Wed Nov 27 09:31:19 2024 +0100

    Merge pull request #1980 from UnderminersTeam/dependabot/nuget/System.ComponentModel.Composition-9.0.0

    Bump System.ComponentModel.Composition from 8.0.0 to 9.0.0

commit 5bbc257635e079639b5b566269f8b572928e9bed
Merge: b286cd39 08a20340
Author: Miepee <[email protected]>
Date:   Wed Nov 27 09:29:20 2024 +0100

    Merge pull request #1939 from Skirlez/master

    Add ParentEntry to code editor

commit b286cd391904cf1a8cc491742b2bb2ddb1fcdd6f
Merge: e9a7cf0d bef58f5d
Author: Miepee <[email protected]>
Date:   Wed Nov 27 09:24:32 2024 +0100

    Merge pull request #1979 from UnderminersTeam/dependabot/nuget/Microsoft.CodeAnalysis.Analyzers-3.11.0

    Bump Microsoft.CodeAnalysis.Analyzers from 3.3.4 to 3.11.0

commit e9a7cf0d447293037327117a8f83bdc3d1f34f6c
Merge: d9df6348 30bd6450
Author: Miepee <[email protected]>
Date:   Wed Nov 27 09:24:20 2024 +0100

    Merge pull request #1981 from UnderminersTeam/dependabot/nuget/Microsoft.NET.Test.Sdk-17.12.0

    Bump Microsoft.NET.Test.Sdk from 17.11.1 to 17.12.0

commit 30bd645094f9423e20cefe72f0e8ca552ef1948f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Nov 26 02:42:04 2024 +0000

    Bump Microsoft.NET.Test.Sdk from 17.11.1 to 17.12.0

    Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.1 to 17.12.0.
    - [Release notes](https://github.com/microsoft/vstest/releases)
    - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
    - [Commits](https://github.com/microsoft/vstest/compare/v17.11.1...v17.12.0)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.NET.Test.Sdk
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 0ee9d2767d5057b4b313937152291710a00048a1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Nov 26 02:42:03 2024 +0000

    Bump System.ComponentModel.Composition from 8.0.0 to 9.0.0

    Bumps [System.ComponentModel.Composition](https://github.com/dotnet/runtime) from 8.0.0 to 9.0.0.
    - [Release notes](https://github.com/dotnet/runtime/releases)
    - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v9.0.0)

    ---
    updated-dependencies:
    - dependency-name: System.ComponentModel.Composition
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit bef58f5db026435c22fea0203231ba5bfb4d5f77
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Nov 26 02:41:48 2024 +0000

    Bump Microsoft.CodeAnalysis.Analyzers from 3.3.4 to 3.11.0

    Bumps [Microsoft.CodeAnalysis.Analyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.4 to 3.11.0.
    - [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
    - [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
    - [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.CodeAnalysis.Analyzers
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 08a20340e41d0f68d7e9174601b3fda13e148297
Author: Skirlez <[email protected]>
Date:   Mon Nov 25 21:54:47 2024 +0200

    Rename UndertaleObjectReference's CanDragInto to CanChange

commit 9c178ee32cfce312cef4cb7e82d5ac0aaef9d129
Merge: 49b3adad d9df6348
Author: colinator27 <[email protected]>
Date:   Mon Nov 25 10:21:25 2024 -0500

    Merge branch 'master' into underanalyzer

commit d9df63482e94581eb4b92ee3d618115b475c66f5
Merge: 8744a525 7c904724
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:59:21 2024 +0100

    Merge pull request #1890 from UnderminersTeam/texture-handling-rewrite

    Compatibility upgrade of scripts involving textures

commit 8744a525892d1e7cfbfe9c2da7f5ff0bd9da3d09
Merge: ee5b28ed 804135c6
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:55:46 2024 +0100

    Merge pull request #1970 from UnderminersTeam/dependabot/nuget/MSTest.TestFramework-3.6.3

    Bump MSTest.TestFramework from 3.5.2 to 3.6.3

commit ee5b28ed03abedc7cddb37ec49b583fae988fb2c
Merge: abb4578a 28a3e297
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:55:26 2024 +0100

    Merge pull request #1968 from UnderminersTeam/dependabot/nuget/log4net-3.0.3

    Bump log4net from 2.0.17 to 3.0.3

commit abb4578a990857dce9142e767a90385681ebbce4
Merge: 1cdae186 9fb34bf3
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:54:24 2024 +0100

    Merge pull request #1971 from UnderminersTeam/dependabot/nuget/MSTest.TestAdapter-3.6.3

    Bump MSTest.TestAdapter from 3.5.2 to 3.6.3

commit 1cdae1860f6651f360f8769706acd95049b2e418
Merge: f2caf89a b1c4154d
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:54:11 2024 +0100

    Merge pull request #1977 from UnderminersTeam/dependabot/nuget/Fody-6.9.1

    Bump Fody from 6.8.1 to 6.9.1

commit f2caf89a4c4c919f580691bf7e2012360e147469
Merge: ad5f211a 159dfd5a
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:53:43 2024 +0100

    Merge pull request #1902 from luizzeroxis/app-manifest

    Add manifest to enable better styled dialogs

commit 7c904724847da3b56c054fc7057df17c0c58976e
Author: Miepee <[email protected]>
Date:   Mon Nov 25 11:51:39 2024 +0100

    Update UndertaleModTool/Scripts/Community Scripts/FontEditor.csx

commit ad5f211af44d59adc5fb1a14120b65b827ea9af4
Merge: caf04126 216d7b5c
Author: colinator27 <[email protected]>
Date:   Sat Nov 23 12:17:11 2024 -0500

    Merge pull request #1941 from zivmaor/saving-child-error

    fix #1940

commit 29d238d60d8a5a9827e02827b5537f538b47d18c
Author: colinator27 <[email protected]>
Date:   Sat Nov 23 12:15:33 2024 -0500

    Fix missing parenthesis

commit 49b3adad5988d90e325ea345013eff94541a8479
Merge: 8377c5a4 caf04126
Author: colinator27 <[email protected]>
Date:   Sat Nov 23 12:08:02 2024 -0500

    Merge branch 'master' into underanalyzer

commit b1c4154d7e06f5d13a87176db95254fc4ecf0968
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 20 03:06:22 2024 +0000

    Bump Fody from 6.8.1 to 6.9.1

    Bumps [Fody](https://github.com/Fody/Fody) from 6.8.1 to 6.9.1.
    - [Release notes](https://github.com/Fody/Fody/releases)
    - [Commits](https://github.com/Fody/Fody/compare/6.8.1...6.9.1)

    ---
    updated-dependencies:
    - dependency-name: Fody
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 9fb34bf340b7d8257172984374ef9e6029749896
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 13 02:36:08 2024 +0000

    Bump MSTest.TestAdapter from 3.5.2 to 3.6.3

    Bumps [MSTest.TestAdapter](https://github.com/microsoft/testfx) from 3.5.2 to 3.6.3.
    - [Release notes](https://github.com/microsoft/testfx/releases)
    - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
    - [Commits](https://github.com/microsoft/testfx/commits)

    ---
    updated-dependencies:
    - dependency-name: MSTest.TestAdapter
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 804135c69e48eae2ff14f12fa74df293ca247a46
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 13 02:35:12 2024 +0000

    Bump MSTest.TestFramework from 3.5.2 to 3.6.3

    Bumps [MSTest.TestFramework](https://github.com/microsoft/testfx) from 3.5.2 to 3.6.3.
    - [Release notes](https://github.com/microsoft/testfx/releases)
    - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
    - [Commits](https://github.com/microsoft/testfx/commits)

    ---
    updated-dependencies:
    - dependency-name: MSTest.TestFramework
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 28a3e297e8acead4e6b268e66ff7d858b27161f6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 8 02:13:56 2024 +0000

    Bump log4net from 2.0.17 to 3.0.3

    Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.17 to 3.0.3.
    - [Release notes](https://github.com/apache/logging-log4net/releases)
    - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.17...rel/3.0.3)

    ---
    updated-dependencies:
    - dependency-name: log4net
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 05b4961b73508d7746e2249936410e9f89ccdcc5
Author: luizzeroxis <[email protected]>
Date:   Sat Nov 2 18:17:41 2024 -0300

    Fix 2024.6 masks not showing sometimes

commit 159dfd5a65b74f706e5f021c1f7e641e922fd8b0
Author: Vladislav Stepanov <[email protected]>
Date:   Mon Oct 28 19:20:47 2024 +0300

    Uncomment the Windows 10 `supportedOS` tag

commit 4f8782813d5abee903819085e8824ed68a3f927c
Author: Vladislav Stepanov <[email protected]>
Date:   Mon Oct 28 19:16:30 2024 +0300

    Remove unsupported Windows versions.

commit fb746806261853849d82959b3370db9a0688329a
Author: Skirlez <[email protected]>
Date:   Thu Oct 24 11:53:15 2024 +0300

    Added CanDragInto property to UndertaleObjectReference

commit 54968e3ef8592b1a4cbf2894b31f01fd9e50fe49
Author: zivmaor <[email protected]>
Date:   Wed Oct 23 17:29:49 2024 +0300

    minor code improvement

commit 08ad289f7eed863b2ca85b02500a5aa8cce9f7f2
Author: zivmaor <[email protected]>
Date:   Sun Oct 13 15:40:45 2024 +0300

    Apple changes from 60515b1 to UndertaleResourceReferenceMap

commit 992524c14ae167412de4797f1bb8d39e96743cc5
Author: zivmaor <[email protected]>
Date:   Wed Oct 9 00:38:47 2024 +0300

    Add error handling to FindReferencesTypesDialog

commit 60515b110735120e74bba7c05e7a853709f60258
Author: zivmaor <[email protected]>
Date:   Wed Oct 9 00:08:43 2024 +0300

    Fix GetReferencesOfObject for Bytecode version 15

    Move check for language to only be done on bytecode version 16 and up.
    See https://github.com/UnderminersTeam/UndertaleModTool/wiki/Bytecode-version-differences.
    Fixes #1946.

commit 216d7b5c3f29185ecebd348b30245fab92da8fb1
Author: zivmaor <[email protected]>
Date:   Sun Oct 6 13:39:46 2024 +0300

    fix #1940

    Fix DecompiledEditor and DisassemblyEditor erroneously
    reporting that they have changed when loading a child code entry,
    resulting in an error when trying to save.
    Also minor grammar fix.

commit caf04126f273b57bb2200b8739bb9d57e25d8f92
Merge: 9f4f13a5 631db508
Author: Miepee <[email protected]>
Date:   Sun Oct 6 09:29:26 2024 +0200

    Merge pull request #1923 from zivmaor/unreferencedAssetsFix

    fix #1747

commit 8377c5a4a2ebe6e499c2cb328b25b5b82b08b806
Merge: 8c5462c4 34c0dec9
Author: Miepee <[email protected]>
Date:   Sun Oct 6 09:29:00 2024 +0200

    Merge pull request #1919 from ChronoVortex/struct-fix

    Remove struct keyword

commit f9b6d5a0d813013c14612d7ee82d629b038d9415
Author: Skirlez <[email protected]>
Date:   Sat Oct 5 16:56:59 2024 +0300

    Add parent entry to code editor

commit 631db5084869812a3d2746ca15314b0c1440121c
Author: zivmaor <[email protected]>
Date:   Fri Oct 4 22:32:46 2024 +0300

    whitespace and style fix

commit e5cba7e7ee679b0e626d12e1410642d900ebf31d
Author: luizzeroxis <[email protected]>
Date:   Mon Sep 23 20:40:20 2024 -0300

    Removed name and version from manifest

commit 1a4759e84749304bcbcdd1273c18f9d33784e834
Author: zivmaor <[email protected]>
Date:   Fri Sep 20 15:48:55 2024 +0300

    fix #1747

commit 34c0dec9771c13e5d0d6f96df999a538e23c394e
Author: ChronoVortex <[email protected]>
Date:   Tue Sep 17 20:27:53 2024 -0700

    remove struct keyword

commit 9aef94cc393b71ebf5e00ef4a8dc857f76afa442
Author: colinator27 <[email protected]>
Date:   Sun Sep 8 16:33:19 2024 -0400

    Address some reviews

commit 73ab086c41186514da836fea3a048bdccedb12f3
Author: colinator27 <[email protected]>
Date:   Sun Sep 8 15:58:31 2024 -0400

    Replace WebClient with HttpClient

commit 9f4f13a52495f82663dd125c0028519850faba83
Merge: 5bf01fa2 b2833d6a
Author: Miepee <[email protected]>
Date:   Sat Sep 7 22:45:25 2024 +0200

    Merge pull request #1904 from UnderminersTeam/dependabot/nuget/Microsoft.NET.Test.Sdk-17.11.1

    Bump Microsoft.NET.Test.Sdk from 17.11.0 to 17.11.1

commit 5bf01fa286c17a7355e09e89a45d8bb7a3c4fbd0
Merge: 69095cdf 0ff48290
Author: Miepee <[email protected]>
Date:   Sat Sep 7 22:45:07 2024 +0200

    Merge pull request #1906 from UnderminersTeam/readme-screenshot-update

    Update RIBBIT screenshot on README

commit 0ff482901bf83f3bb935656a1071e38030987f7a
Author: colinator27 <[email protected]>
Date:   Sat Sep 7 14:24:34 2024 -0400

    Update RIBBIT screenshot on README

commit ff7845ff5b66f708bb21971bb6a84f8435d4408e
Author: Luiz Pontes <[email protected]>
Date:   Sat Sep 7 12:08:27 2024 -0300

    Manifest name and version (it probably doesn't matter)

commit b2833d6a4eff03b972cd3c9e66332db49fd081d8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Sep 6 02:27:51 2024 +0000

    Bump Microsoft.NET.Test.Sdk from 17.11.0 to 17.11.1

    Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.0 to 17.11.1.
    - [Release notes](https://github.com/microsoft/vstest/releases)
    - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
    - [Commits](https://github.com/microsoft/vstest/compare/v17.11.0...v17.11.1)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.NET.Test.Sdk
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 7778b7609e094f83deb425aac00afdb4346599a3
Author: luizzeroxis <[email protected]>
Date:   Wed Sep 4 19:49:20 2024 -0300

    Add manifest to enable better styled dialogs

commit 69095cdf7773fb7b35bea6a78b2476f343c1a92f
Merge: dc1e2097 64a6b988
Author: Miepee <[email protected]>
Date:   Sat Aug 31 22:20:19 2024 +0200

    Merge pull request #1899 from Garethp/#1898-Texture-NRE-Fix

    Issue #1898: Prevent NREs when adding new Texture Page Items or Embedded textures

commit 64a6b9880d4b57c6e213736cbe9666c3b1911f91
Author: Gareth <[email protected]>
Date:   Sat Aug 31 19:10:42 2024 +0100

    Update docbloc comments to use `see langword`

commit ae0f210aed5d385ea948aa6b7e3d055c8dbe082c
Author: Gareth <[email protected]>
Date:   Fri Aug 30 23:54:41 2024 +0100

    Documenting new return values and clearing the Image source when image is null

commit 0dbcf7837e07bed4d713327c9e11e78e64458427
Author: Gareth <[email protected]>
Date:   Fri Aug 30 23:14:08 2024 +0100

    Add some null checks to ensure that we don't hit any NRE's when adding new Texture Page Items or new Embedded Textures. Closes issue #1898

commit 8008bd084972ecd102c708df9901364f289d138d
Author: colinator27 <[email protected]>
Date:   Tue Aug 27 12:07:45 2024 -0400

    Manually add DEBUG constant to nightly builds

commit dc1e209759472845681f66b1dafffcd1a1d46867
Merge: cdde5733 605198bd
Author: Miepee <[email protected]>
Date:   Mon Aug 26 22:27:40 2024 +0200

    Merge pull request #1892 from UnderminersTeam/reword_id_tooltip

    Slightly reword asset ID hover tooltip

commit 605198bd2dffa8619950776fe077387df23799eb
Author: colinator27 <[email protected]>
Date:   Mon Aug 26 16:20:13 2024 -0400

    Slightly reword asset ID hover tooltip

    Tooltip is now more encompassing than just "object," since it can also be any asset (e.g. a sprite) or item (e.g. a texture page item or string).

commit cdde5733d852a9eeaf285da03630a3666587f2cc
Merge: fe84e46d 695a8359
Author: Miepee <[email protected]>
Date:   Mon Aug 26 22:16:39 2024 +0200

    Merge pull request #1891 from UnderminersTeam/net8_workflows

    Update workflows to setup .NET 8

commit 695a83591be4ed2b3504110f0c9aec5d6193f004
Author: colinator27 <[email protected]>
Date:   Mon Aug 26 16:10:39 2024 -0400

    Update workflows to setup .NET 8

commit 59be42c4a2af385c838938af48d4c0dce83ed182
Author: colinator27 <[email protected]>
Date:   Mon Aug 26 15:53:39 2024 -0400

    A few additional compatibility script upgrades

commit c4b8b805d789c520f8a7ef308c629ab0f39e3e93
Author: colinator27 <[email protected]>
Date:   Mon Aug 26 15:28:10 2024 -0400

    Compatibility upgrade of texture scripts

commit fe84e46d2896fcb5f16cec8a719d32cea9953fbb
Merge: 68a14b91 b70fe3e8
Author: Miepee <[email protected]>
Date:   Mon Aug 26 06:28:52 2024 +0200

    Merge pull request #1889 from UnderminersTeam/net8

    Upgrade to .net8

commit b70fe3e8dadeba2df9463c17f5f720b0d1eb6ec5
Author: Miepee <[email protected]>
Date:   Mon Aug 26 00:12:17 2024 +0200

    forgot a project the sequel

commit e383cc19c486f68aadcd06eeabaec27b1e2f0fbb
Author: Miepee <[email protected]>
Date:   Mon Aug 26 00:04:31 2024 +0200

    forgot a project

commit 547926d646a2cd0f6b1156ee0b7c5820da1116bd
Author: Miepee <[email protected]>
Date:   Sun Aug 25 23:25:32 2024 +0200

    Upgrade to .net8

commit 68a14b918cb58d0902ef5031dd408dd52b5e1f6b
Merge: fe1b45b6 a2fa3e06
Author: Miepee <[email protected]>
Date:   Sun Aug 25 14:34:28 2024 +0200

    Merge pull request #1859 from NC-devC/droidfixnew

    More fixes for TouchControlsEnabler.

commit fe1b45b6c5c468774254abdf5cd7b2c1f56f8824
Merge: 6f470f85 4d2ef0b6
Author: Miepee <[email protected]>
Date:   Sat Aug 24 22:20:28 2024 +0200

    Merge pull request #1887 from UnderminersTeam/fix-string-bounds-checks

    Fix string reading bounds checks

commit 4d2ef0b62e2adbf56adc6460c48fe876a328190f
Author: colinator27 <[email protected]>
Date:   Sat Aug 24 15:18:55 2024 -0400

    Fix string reading bounds checks

commit a2fa3e063efdfc2fb7a15f186663e235a5a86227
Author: NC <[email protected]>
Date:   Sat Aug 24 21:17:49 2024 +0300

    Config ratio fix, added horizontal one

    Now it works better

commit a1444313c60067867a3ac3128fa03a160f9e6f32
Author: NC <[email protected]>
Date:   Sat Aug 24 20:43:51 2024 +0300

    renamed variables, and removed useless one

commit 6f470f8581f2d784b373d6422306d6ac89aed371
Merge: 3dd882b2 038e17f1
Author: Miepee <[email protected]>
Date:   Fri Aug 23 22:26:17 2024 +0200

    Merge pull request #1886 from UnderminersTeam/code-serialization-cleanup

    Code (de)serialization cleanup and optimization

commit 038e17f123618d60ca9ae453348c982b04b64b9d
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 15:58:01 2024 -0400

    Adjust newlines

commit cdd112f44f263d607aa88f172d6e1cea0bb7a5dc
Merge: 4b6870b5 3dd882b2
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 15:03:00 2024 -0400

    Merge branch 'master' into code-serialization-cleanup

commit 3dd882b2ddd4cbd2909935235dc30fd12b0b6e63
Merge: 4e3f420a 28d7c874
Author: Miepee <[email protected]>
Date:   Fri Aug 23 21:02:15 2024 +0200

    Merge pull request #1885 from UnderminersTeam/add-negative-length-checks

    Add negative length checks during deserialization

commit 28d7c874e94c7e4198b83f66b6476777e0cbb3b7
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 14:57:05 2024 -0400

    Fix missing parenthesis

commit 80627b6fd8c22c507f7a801f332c6537c9019803
Merge: 6d6b0f47 4e3f420a
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 14:56:30 2024 -0400

    Merge branch 'master' into add-negative-length-checks

commit 4e3f420abb9b9eb723f14f61f465d628997aff8f
Merge: 320d7892 d889e5ef
Author: Miepee <[email protected]>
Date:   Fri Aug 23 20:53:18 2024 +0200

    Merge pull request #1884 from UnderminersTeam/remove-extra-debug-checks

    Remove extra debug checks

commit 4b6870b55f11643bda7d768c129d53802fb2c36f
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 14:49:07 2024 -0400

    Code (de)serialization cleanup and optimization

commit 6d6b0f475e72eb5f4235cd0cc7c77f25545af80b
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 14:43:36 2024 -0400

    Add negative length checks during deserialization

commit d889e5ef91a72f7b3999124a8f0dddb4585db805
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 14:33:27 2024 -0400

    Remove extra debug checks

commit 320d7892729742eb792f29304f2543f3763fef47
Author: colinator27 <[email protected]>
Date:   Fri Aug 23 12:47:21 2024 -0400

    Merge in changes for 0.6.1.0

    commit b93dcc5bcef59be31c690789b194d58a31431d34
    Author: colinator27 <[email protected]>
    Date:   Fri Aug 23 12:08:58 2024 -0400

        Bump version to 0.6.1.0

    commit 0cea983f0026f35fb4453a83e1afc3b14b50c1c5
    Author: Liu Wenyuan <[email protected]>
    Date:   Fri Aug 23 07:47:10 2024 +0800

        Address suggestions, improve comments

    commit fb82caffe91826ce9e91944f14561b368a5b070e
    Author: Liu Wenyuan <[email protected]>
    Date:   Sun Aug 18 19:26:14 2024 +0800

        Remove unnecessary brackets

    commit 51411072876169e99ade9863a0b3cb81484e542f
    Author: Liu Wenyuan <[email protected]>
    Date:   Sun Aug 18 19:03:34 2024 +0800

        Address review suggestions

    commit 14cd8e434eff45eabfb7328c607663ae5441defa
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 20:41:01 2024 +0800

        Ok a compromise is possible

    commit 71a162d5a5493574b4d497a9f109bd575a939727
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 20:39:08 2024 +0800

        Get the most use of the three quotation marks!

        Allt hay newlines

    commit c28b06e93e800991af73921c5e5428af192292e0
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 18:26:39 2024 +0800

        Fix typo in intro error message

    commit 6605dfcacc12c506c48d4f2a8ede9b9f2c1eb1fd
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 18:02:00 2024 +0800

        Address review comment suggestions

    commit 7b37bc7ecc0bd00592cad8e56e80e64f6a19daff
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 07:11:58 2024 +0800

        More cleanup

    commit e5a22b32c96ba008d3f31e434deee88f3fce2f9c
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 07:00:54 2024 +0800

        Remove unneeded border drawing setup, cleanup

    commit f067fbd755852f659e1a9686f564fc32c598b7ab
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 06:40:00 2024 +0800

        Fix Joystick Menu and default buttons

    commit ba593ac95bc05acbd7a997009425005e1f88c843
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 00:53:36 2024 +0800

        Fix door destination

    commit 6d69878675701ab05b586376a0ddbec30f021181
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 00:51:29 2024 +0800

        Fix braces, ask to enable Dog Shrine

    commit 3326459d3e67da130f9c2a013f880f8867a2cbf5
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 00:42:39 2024 +0800

        Add NXTALE fixes for Xbox version and gamepad

    commit 0f559dbd61613b5b46d9e19e8e28bd164e065d4f
    Author: Liu Wenyuan <[email protected]>
    Date:   Sat Aug 17 00:41:48 2024 +0800

        Rename first so diffs look normal

    commit b238ba67d78347b53c708308093d52e6c5446495
    Author: Jacky720 <[email protected]>
    Date:   Thu Aug 22 16:28:04 2024 -0400

        Remove old code

    commit 994f29b83974de0f61d8e2191a1c22fa40319431
    Author: Jacky720 <[email protected]>
    Date:   Sat Aug 17 11:03:52 2024 -0400

        we don't need this here

    commit 3c958fbff9d8a8fa55b1c32c40c2eeeac4443811
    Author: Jacky720 <[email protected]>
    Date:   Sat Aug 17 10:57:23 2024 -0400

        Fix Branch being overwritten less precisely

    commit 964ebd082f14f0d65dde231584ddc99f02b0493d
    Author: colinator27 <[email protected]>
    Date:   Sat Aug 17 12:49:23 2024 -0400

        Fix EmSize being always parsed as 0, if a float

commit 147a289d4729644dcbb367ba97d6429d1b7f094c
Merge: 405f10f6 ad4cca11
Author: Miepee <[email protected]>
Date:   Fri Aug 23 02:08:46 2024 +0200

    Merge pull request #1872 from Dobby233Liu/nxtale-script-xbox-support-1

    Add NXTALE fixes for Xbox version and gamepad

commit ad4cca1110543a36737e29ca27154bcc685fd193
Author: Miepee <[email protected]>
Date:   Fri Aug 23 02:08:26 2024 +0200

    Update UndertaleModTool/Scripts/Builtin Scripts/RunSwitchAndXboxOnPC.csx

commit 7c5822a933eb3247fa0e04783a0621a65883ca6b
Author: Liu Wenyuan <[email protected]>
Date:   Fri Aug 23 07:47:10 2024 +0800

    Address suggestions, improve comments

commit 405f10f665b1f337daa4d10d51a9d3d786887bec
Merge: 468a6edb bcdaf415
Author: Miepee <[email protected]>
Date:   Thu Aug 22 23:37:53 2024 +0200

    Merge pull request #1870 from UnderminersTeam/texture-handling-rewrite

    Rewrite texture handling

commit 468a6edbb873cdd5c6ed24cf0c157d16cd3b51a0
Merge: a1b0fdd2 520482e1
Author: Miepee <[email protected]>
Date:   Thu Aug 22 23:21:28 2024 +0200

    Merge pull request #1877 from luizzeroxis/master

    Changed quitting to show a yes/no/cancel dialog instead of 2 yes/no dialogs

commit a1b0fdd221858072c463248207fea29fa9aa1b86
Merge: 77159770 eba41ca3
Author: Miepee <[email protected]>
Date:   Thu Aug 22 23:08:57 2024 +0200

    Merge pull request #1856 from Dobby233Liu/Dobby233Liu-UTWithJSON-loader-speedup-1

    Use buffer for reading JSON in UndertaleWithJSONs

commit 520482e12a7b071942c2f8e941aebdd4aea6170e
Author: luizzeroxis <[email protected]>
Date:   Thu Aug 22 17:56:44 2024 -0300

    Improved code readability

commit 7715977050612b7c814dd9adf47809b54309cee2
Merge: 16679bd4 077ac61b
Author: Miepee <[email protected]>
Date:   Thu Aug 22 22:50:25 2024 +0200

    Merge pull request #1874 from Jacky720/lts-differentiation

    Fix Branch being overwritten less precisely

commit 077ac61b58efefdfc1443ae001f2ed20608f981f
Author: Jacky720 <[email protected]>
Date:   Thu Aug 22 16:28:04 2024 -0400

    Remove old code

commit bcdaf415e138432fb05ff92548f36b39f5436d6d
Merge: e8e036f7 16679bd4
Author: colinator27 <[email protected]>
Date:   Thu Aug 22 15:51:59 2024 -0400

    Merge branch 'master' into texture-handling-rewrite

commit 16679bd47d09435e04c449e9a70af10a2c16cc4f
Merge: c82e5f74 931fda66
Author: Miepee <[email protected]>
Date:   Thu Aug 22 21:13:14 2024 +0200

    Merge pull request #1876 from UnderminersTeam/nightly-prerelease-flag

    Mark nightly releases as prereleases

commit c82e5f741d35dbff6680137d3fbf683b6d7f817f
Merge: 88eeb308 db7e1b1e
Author: Miepee <[email protected]>
Date:   Thu Aug 22 21:01:39 2024 +0200

    Merge pull request #1881 from UnderminersTeam/dependabot/nuget/Microsoft.NET.Test.Sdk-17.11.0

    Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.0

commit db7e1b1eddd424386cdfc9c4686a63e02ab35dd9
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 21 02:38:09 2024 +0000

    Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.0

    Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.10.0 to 17.11.0.
    - [Release notes](https://github.com/microsoft/vstest/releases)
    - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
    - [Commits](https://github.com/microsoft/vstest/compare/v17.10.0...v17.11.0)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.NET.Test.Sdk
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 22e6de2eeb52305d05cb4c28f7e6e7cdd3e72f26
Author: luizzeroxis <[email protected]>
Date:   Sun Aug 18 15:42:21 2024 -0300

    Removed quit var and fixed style

commit 8b2e32e563d3b3812f2ec50bde2f629580264de9
Author: luizzeroxis <[email protected]>
Date:   Sun Aug 18 14:31:47 2024 -0300

    Changed quitting to show a yes/no/cancel dialog instead of 2 yes/no dialogs

commit 931fda66b74f643bdc326d0401bfdc96891df255
Author: colinator27 <[email protected]>
Date:   Sun Aug 18 10:59:01 2024 -0400

    Mark nightly releases as prereleases

commit e8e036f7956597679e5460d71511ff5fb8fea0a4
Author: colinator27 <[email protected]>
Date:   Sun Aug 18 10:27:13 2024 -0400

    Address reviews

commit 1a1fcdf469eb255f777e6550f9a942d3f2580bb5
Author: Liu Wenyuan <[email protected]>
Date:   Sun Aug 18 19:26:14 2024 +0800

    Remove unnecessary brackets

commit 825c1378285f0f1943656feb7cb0a807f884a704
Author: Liu Wenyuan <[email protected]>
Date:   Sun Aug 18 19:03:34 2024 +0800

    Address review suggestions

commit 88eeb30829662721b4817355100a3f0c6bfaecb5
Merge: 308e7f74 1f6fa627
Author: Miepee <[email protected]>
Date:   Sun Aug 18 09:32:45 2024 +0200

    Merge pull request #1875 from UnderminersTeam/fix-emsize

    Fix EmSize being always parsed as 0, if a float

commit 90834d81b095b1ce8d59a260ea17ec37bd60baba
Author: colinator27 <[email protected]>
Date:   Sat Aug 17 19:03:16 2024 -0400

    Address reviews, and some small changes

commit 1f6fa627841a146f182b53c39187ead4f39a6372
Author: colinator27 <[email protected]>
Date:   Sat Aug 17 12:49:23 2024 -0400

    Fix EmSize being always parsed as 0, if a float

commit 7527b38b7462f7f91014d089ef397ce48aa2f368
Author: Jacky720 <[email protected]>
Date:   Sat Aug 17 11:03:52 2024 -0400

    we don't need this here

commit 7609366bb8cbf7aca808a9ae1c78711b88746b1e
Author: Jacky720 <[email protected]>
Date:   Sat Aug 17 10:57:23 2024 -0400

    Fix Branch being overwritten less precisely

commit 65c4c0240c7b13c8a77d3db96c13467fe681b704
Merge: 56deb0ce 308e7f74
Author: Jacky720 <[email protected]>
Date:   Sat Aug 17 10:56:00 2024 -0400

    Merge remote-tracking branch 'upstream/master' into lts-differentiation

commit 56deb0ce1fcc171ebd1e51f916e51398e5f3c551
Merge: 4a4d55ea 1df139dc
Author: Jacky720 <[email protected]>
Date:   Sat Aug 17 10:55:54 2024 -0400

    Merge branch 'lts-differentiation' of https://github.com/Jacky720/UndertaleModTool into lts-differentiation

commit 26aa32a96247cf71338720ba17e9680e3f769a9d
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 20:41:01 2024 +0800

    Ok a compromise is possible

commit fc71a0bffc1167a36f4f13d4a8fb54b23f0ac2e8
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 20:39:08 2024 +0800

    Get the most use of the three quotation marks!

    Allt hay newlines

commit 3751d227da32cb986e636eeb237374d8152fe6a0
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 18:26:39 2024 +0800

    Fix typo in intro error message

commit b4b3ed51d1a9eef523d943b5e519ec1cbd8d6bf9
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 18:02:00 2024 +0800

    Address review comment suggestions

commit 308e7f7446c660be113575e11ecac663b4bcd060
Merge: f5774361 67ef4c4c
Author: Miepee <[email protected]>
Date:   Sat Aug 17 11:51:14 2024 +0200

    Merge pull request #1865 from UnderminersTeam/dependabot/nuget/MSTest.TestFramework-3.5.2

    Bump MSTest.TestFramework from 3.5.0 to 3.5.2

commit f57743610c685e44435cfe99d3325fd6de4103e8
Merge: b53ce21d 9acbe1bb
Author: Miepee <[email protected]>
Date:   Sat Aug 17 11:50:59 2024 +0200

    Merge pull request #1866 from UnderminersTeam/dependabot/nuget/MSTest.TestAdapter-3.5.2

    Bump MSTest.TestAdapter from 3.5.0 to 3.5.2

commit b53ce21dfd6ba9a5ba7016e4b238bfad0a6d89e4
Merge: 5f2b1afa 50e96640
Author: Miepee <[email protected]>
Date:   Sat Aug 17 11:50:46 2024 +0200

    Merge pull request #1871 from UnderminersTeam/dependabot/nuget/Microsoft.CodeAnalysis.CSharp.Scripting-4.11.0

    Bump Microsoft.CodeAnalysis.CSharp.Scripting from 4.10.0 to 4.11.0

commit f16a254163c3c60aaac558bca90fc63c71a16dce
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 07:11:58 2024 +0800

    More cleanup

commit 438ec5aa6022fc1eddc65519753ebd854e83b160
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 07:00:54 2024 +0800

    Remove unneeded border drawing setup, cleanup

commit dfc4c042fc4d78a57432e1b1c33b92e07f4b21d9
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 06:40:00 2024 +0800

    Fix Joystick Menu and default buttons

commit 064410860847abaa364aebf2bb3665c8681bdedc
Author: colinator27 <[email protected]>
Date:   Fri Aug 16 16:37:04 2024 -0400

    Switch a remaining RGBA to BGRA

commit 8c69e79f64d103a9a43dd8e9b49fea55e3222acb
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 00:53:36 2024 +0800

    Fix door destination

commit 36828edfe279bddd0dcf23cf4e5d870a63734900
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 00:51:29 2024 +0800

    Fix braces, ask to enable Dog Shrine

commit bb707686d04f74c884af5b76004ad140f85c8270
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 00:42:39 2024 +0800

    Add NXTALE fixes for Xbox version and gamepad

commit 704b6ea9221f21db715fc8a82314bbff53c71ddc
Author: Liu Wenyuan <[email protected]>
Date:   Sat Aug 17 00:41:48 2024 +0800

    Rename first so diffs look normal

commit 50e966402f404661100657c8e584fec6c678e9f2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Aug 16 02:59:29 2024 +0000

    Bump Microsoft.CodeAnalysis.CSharp.Scripting from 4.10.0 to 4.11.0

    Bumps [Microsoft.CodeAnalysis.CSharp.Scripting](https://github.com/dotnet/roslyn) from 4.10.0 to 4.11.0.
    - [Release notes](https://github.com/dotnet/roslyn/releases)
    - [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
    - [Commits](https://github.com/dotnet/roslyn/commits)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.CodeAnalysis.CSharp.Scripting
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit c020a948964068dc504758b0dcf0a733a73c8299
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 18:26:33 2024 -0400

    Fix typo

commit 03dfdd4f28b032966565fbfd05ad9965cbf16539
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 16:34:48 2024 -0400

    Fix minor WPF error message

commit 6838e692b0fef962b99c7a0c0c10cc4371911be1
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 16:34:36 2024 -0400

    Fix mask import/export on 2024.6+, and cleanup

commit 221f201b473adf4acf00af5be2c1a95cf52c56ce
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 15:45:34 2024 -0400

    Cleanup and memory leak fix

commit ab6c198bb2ddbfad8661f3f6f30c97c96e007365
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 11:29:26 2024 -0400

    Undo Microsoft.Windows.Compatibility bump for now

commit ce94847ee112b9f4ff62fd4e71a795ee4c7b9529
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 11:16:05 2024 -0400

    Fix spacing

commit 70b6ab21eefc12a26d595ddb429ebb02fc2f557a
Author: colinator27 <[email protected]>
Date:   Thu Aug 15 11:11:19 2024 -0400

    Address reviews

commit 8c5462c41eab770fa9bcb0da1cf5ed014bc20362
Author: colinator27 <[email protected]>
Date:   Wed Aug 14 22:55:51 2024 -0400

    Fix ExportAllCode

commit c74c24dfed062e87d7858cb493321f38b97079bc
Author: colinator27 <[email protected]>
Date:   Wed Aug 14 16:26:42 2024 -0400

    Some cleanup

commit ddea1576b9e6fe69ffb42f612afe8f9a26e8ba10
Author: colinator27 <[email protected]>
Date:   Wed Aug 14 16:23:51 2024 -0400

    Add two missing comments

commit b269fa229ed28005097916a871635f66f42eac5d
Author: colinator27 <[email protected]>
Date:   Wed Aug 14 16:01:58 2024 -0400

    Further optimize BZip2 textures

commit 0b4c1c99fecebd4ae46d1a4c60366e2d4c7c6e2a
Author: colinator27 <[email protected]>
Date:   Wed Aug 14 11:45:13 2024 -0400

    Go back to .NET 6 for now

commit 74d3ccf9a096e8db43a188a39a412043e4c308d2
Author: colinator27 <[email protected]>
Date:   Tue Aug 13 23:04:26 2024 -0400

    Rewrite texture handling, update to .NET 8

    Initial work, most scripts involving textures will no longer work

commit 9acbe1bbb98ff66d896bfc5df1fa2015c928bf3f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 14 02:29:33 2024 +0000

    Bump MSTest.TestAdapter from 3.5.0 to 3.5.2

    Bumps [MSTest.TestAdapter](https://github.com/microsoft/testfx) from 3.5.0 to 3.5.2.
    - [Release notes](https://github.com/microsoft/testfx/releases)
    - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
    - [Commits](https://github.com/microsoft/testfx/compare/v3.5.0...v3.5.2)

    ---
    updated-dependencies:
    - dependency-name: MSTest.TestAdapter
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 67ef4c4c0023f11a9bd99e4a2d1b33925ea36556
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 14 02:29:15 2024 +0000

    Bump MSTest.TestFramework from 3.5.0 to 3.5.2

    Bumps [MSTest.TestFramework](https://github.com/microsoft/testfx) from 3.5.0 to 3.5.2.
    - [Release notes](https://github.com/microsoft/testfx/releases)
    - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
    - [Commits](https://github.com/microsoft/testfx/compare/v3.5.0...v3.5.2)

    ---
    updated-dependencies:
    - dependency-name: MSTest.TestFramework
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 390de700dd7014b68e9695fc87340c0d20f28246
Author: colinator27 <[email protected]>
Date:   Mon Aug 12 13:53:33 2024 -0400

    Fix #1863

    Including this as part of the Underanalyzer branch, as it includes many other compiler changes/fixes

commit 939e4d8b19af99b721071e5e18fd157e2878ef21
Author: colinator27 <[email protected]>
Date:   Mon Aug 12 13:27:06 2024 -0400

    Attempt workflow fix for GameSpecificData

commit caa6cc8d044dba5fbad807145f0d7254a5393ab7
Author: colinator27 <[email protected]>
Date:   Mon Aug 12 13:06:27 2024 -0400

    Update Underanalyzer

commit 41fbb43e50f6382b829f62ede7d89cb9479cff09
Merge: 834b4ead 5f2b1afa
Author: colinator27 <[email protected]>
Date:   Sun Aug 11 21:50:34 2024 -0400

    Merge remote-tracking branch 'origin/master' into underanalyzer

commit 834b4ead2994c35fdba141d402a3b80e1190115a
Author: colinator27 <[email protected]>
Date:   Sun Aug 11 20:36:19 2024 -0400

    Add some comments to AssetReferenceTypes

commit 5f2b1afa978e761c09258d81bcc7dd50777970ca
Merge: 7944d8e5 57af2dba
Author: colinator27 <[email protected]>
Date:   Sun Aug 11 14:46:25 2024 -0400

    Merge remote-tracking branch 'origin/master' into version-bump-0.6

commit 57af2dba0e8169a5308a4b0ca1cde8aae5cedafd
Author: colinator27 <[email protected]>
Date:   Sun Aug 11 14:45:20 2024 -0400

    Attempt at a new workflow for stable builds

commit 7944d8e5848621e214dc01351ebfc991c43c8708
Author: colinator27 <[email protected]>
Date:   Sun Aug 11 14:43:39 2024 -0400

    Hide updater button in non-debug builds

commit f3afdf357a29ecfefc22dd5bd4692bbb20c5d4a8
Author: colinator27 <[email protected]>
Date:   Sun Aug 11 14:22:24 2024 -0400

    Version bump to 0.6.0.0

commit f86ac2a2ff7db26d68adc91b4f575d303545106a
Merge: 63375c2d 1451fc8f
Author: Miepee <[email protected]>
Date:   Sat Aug 10 15:30:38 2024 +0200

    Merge pull request #1861 from VladiStep/itemClipboardFix

    The item name clipboard crash fix.

commit 1451fc8fb9ef6c089c2c73e2bfb3698ef5277225
Author: Vladislav Stepanov <[email protected]>
Date:   Sat Aug 10 15:52:42 2024 +0300

    Fix #1860.

commit 154b18934eb6c6f8f800e38cb149f492fd5ee145
Author: NC <[email protected]>
Date:   Sat Aug 10 15:06:16 2024 +0300

    Disabled controls on destkop devices

    This can be very helpful.

commit 076d5590d1dc7877c1d73b565d8d5b0b9f3d2b7a
Author: NC <[email protected]>
Date:   Sat Aug 10 15:02:52 2024 +0300

    Update TouchControlsEnabler.csx

    yes

commit 4c17ed5b8c8f663410b236010d37c6827f8aaada
Author: NC <[email protected]>
Date:   Sat Aug 10 14:59:34 2024 +0300

    Display scaler(Tested on UT Yellow)

commit 5c711253922741a2f1aba52755f75d445658c2cf
Author: NC <[email protected]>
Date:   Sat Aug 10 10:39:38 2024 +0300

    Small fix

    I made an issue before, that made code name not correctly.

commit 6d5ec52a99d1dd4fa7c1f9600a0da37bab20262c
Merge: 557d4aef 63375c2d
Author: colinator27 <[email protected]>
Date:   Thu Aug 8 21:10:12 2024 -0400

    Merge remote-tracking branch 'origin/master' into underanalyzer

commit 63375c2d193e75414e7d853c9e36ea7308cd9274
Merge: 6dba40ab 9720c11a
Author: Miepee <[email protected]>
Date:   Fri Aug 9 02:51:20 2024 +0200

    Merge pull request #1857 from UnderminersTeam/fix-new-mask-saving

    Fix new mask data dimensions when saving

commit 9720c11a6a1e8c0fa673903c2d05b1ffe448968e
Author: colinator27 <[email protected]>
Date:   Thu Aug 8 17:28:41 2024 -0400

    Fix new mask data dimensions when saving

commit eba41ca394a742a70a7a22cc1f3c92fab860af95
Author: Liu Wenyuan <[email protected]>
Date:   Thu Aug 8 19:10:25 2024 +0800

    LFfix

commit 613eb9a92414312c07aee405ca51c45aee52577f
Author: Liu Wenyuan <[email protected]>
Date:   Thu Aug 8 19:09:24 2024 +0800

    Use buffer for reading JSON in UndertaleWithJSONs

commit 557d4aefa79b8c7e5944259943a42f8a260bccef
Author: colinator27 <[email protected]>
Date:   Sun Aug 4 15:17:32 2024 -0400

    Better handle base directory in game-specific data

commit 298514ae36074233a9d45e4f8421724eb20db6db
Author: colinator27 <[email protected]>
Date:   Sat Aug 3 20:10:34 2024 -0400

    Externalize game-specific data

commit 3d305dc5cd58e84d741f4a1e21a5d23e71ed7769
Merge: 3a63da06 6dba40ab
Author: colinator27 <[email protected]>
Date:   Mon Jul 29 12:08:31 2024 -0400

    Merge remote-tracking branch 'origin/master' into underanalyzer

commit 6dba40ab2b2fec1154f3ee28e280d88442336b4d
Author: Miepee <[email protected]>
Date:   Mon Jul 29 18:01:40 2024 +0200

    Dont publish release bulids of bleeding edge (#1851)

commit b1ad4191fd552e7549c557e7da195e850df9b40e
Merge: da9ec09f 2e46dff0
Author: Miepee <[email protected]>
Date:   Mon Jul 29 15:46:22 2024 +0200

    Merge pull request #1850 from UnderminersTeam/script-paths-and-exceptions

    Supply script file paths, better script exceptions

commit 2e46dff02355a29bb90f7b43ec7802c4a79b16f0
Author: colinator27 <[email protected]>
Date:   Sun Jul 28 00:03:52 2024 -0400

    Supply script file paths, better script exceptions

    Based on code from https://github.com/UnderminersTeam/UndertaleModTool/pull/1504. Modified to fix the root cause of the problem (file paths/encodings not being specified in ScriptOptions), rather than using regular expressions to work around it.

    Also includes the improved script stack traces/exception handling, but further cleaned up and commented.

    Tested to work with built-in scripts and UMP.

commit da9ec09f9f977bb7649a311177777e6636dba49a
Author: Miepee <[email protected]>
Date:   Sat Jul 27 16:47:34 2024 +0200

    Revise for audio, texture, globalinit (#1520)

    * Redo documentation for audio, texture, globalinit

    * revert the one change

    * SPAAAAAAAAAAAAAAAAAAAACE

commit b47792f84a6aa98ada16719065707020980c6629
Merge: c47aca8f e9d08b14
Author: colinator27 <[email protected]>
Date:   Sat Jul 27 10:44:05 2024 -0400

    Merge pull request #1849 from UnderminersTeam/Miepee-patch-3

    Attempt 2 at show commit hash

commit e9d08b148f4bd566ca66faa610b9f84401277004
Author: Miepee <[email protected]>
Date:   Sat Jul 27 10:08:18 2024 +0200

    Attempt 2 at show commit hash

commit 4a4d55ea53d02a2d842af5a252690c3ecee93553
Merge: 215a2d25 21ecfe5e
Author: Jacky720 <[email protected]>
Date:   Tue May 7 15:30:43 2024 -0400

    Merge remote-tracking branch 'upstream/master' into lts-differentiation
  • Loading branch information
@Romualdo666
Romualdo666 committed Dec 18, 2024
1 parent c9d8045 commit 828f4d0
Show file tree
Hide file tree
Showing 103 changed files with 4,095 additions and 2,179 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/publish_cli.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore UndertaleModCli
- name: Build
Expand All @@ -42,6 +42,7 @@ jobs:
run: |
cp ./README.md ./CLI-${{ matrix.os }}/
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
- name: Upload ${{ matrix.os }} CLI
uses: actions/upload-artifact@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish_gui.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand All @@ -41,6 +41,7 @@ jobs:
cp ./README.md ./${{ matrix.os }}
cp ./SCRIPTS.md ./${{ matrix.os }}
cp ./LICENSE.txt ./${{ matrix.os }}
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
- name: Upload ${{ matrix.os }} GUI
uses: actions/upload-artifact@v4
with:
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/publish_gui_nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
configuration: [Debug, Release]
configuration: [Debug]
bundled: [true]
singlefile: [true, false]

Expand All @@ -29,22 +29,23 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
run: |
dotnet build UndertaleModTool --no-restore
dotnet build UndertaleModToolUpdater --no-restore
- name: Publish ${{ matrix.os }} GUI
run: |
dotnet publish UndertaleModTool -c ${{ matrix.configuration }} -r win-x64 -p:DefineConstants=\"SHOW_COMMIT_HASH\" --self-contained ${{ matrix.bundled }} -p:PublishSingleFile=${{ matrix.singlefile }} --output ${{ matrix.os }}
run: | # FIXME: debug constant isn't being applied here, which disables updater, etc., so need to fix that or possibly add a new constant
dotnet publish UndertaleModTool -c ${{ matrix.configuration }} -r win-x64 -p:DefineConstants="SHOW_COMMIT_HASH" --self-contained ${{ matrix.bundled }} -p:PublishSingleFile=${{ matrix.singlefile }} --output ${{ matrix.os }}
dotnet publish UndertaleModToolUpdater -c ${{ matrix.configuration }} -r win-x64 --self-contained ${{ matrix.bundled }} -p:PublishSingleFile=false --output ${{ matrix.os }}/Updater
- name: Copy external files
run: |
cp ./README.md ./${{ matrix.os }}
cp ./SCRIPTS.md ./${{ matrix.os }}
cp ./LICENSE.txt ./${{ matrix.os }}
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
- name: Create zip for nightly release Windows GUI
run: |
7z a -tzip GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip ./${{ matrix.os }}/* -mx0
Expand All @@ -60,7 +61,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
configuration: [Debug, Release]
configuration: [Debug]
bundled: [true]
include:
- os: ubuntu-latest
Expand All @@ -79,7 +80,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore UndertaleModCli
- name: Build
Expand All @@ -90,6 +91,7 @@ jobs:
run: |
cp ./README.md ./CLI-${{ matrix.os }}/
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
- name: Create zip for nightly release CLI
run: |
7z a -tzip CLI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}.zip ./CLI-${{ matrix.os }}/* -mx0
Expand Down Expand Up @@ -118,7 +120,7 @@ jobs:
with:
tag_name: bleeding-edge
name: Bleeding Edge
prerelease: false
prerelease: true
fail_on_unmatched_files: true
files: |
*/*
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/publish_gui_release.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Publish stable release of UndertaleModTool GUI

on:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
build_gui:

strategy:
fail-fast: false
matrix:
os: [windows-latest]
configuration: [Release]
bundled: [true]
singlefile: [true, false]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
run: |
dotnet build UndertaleModTool --no-restore
- name: Publish ${{ matrix.os }} GUI
run: |
dotnet publish UndertaleModTool -c ${{ matrix.configuration }} -r win-x64 --self-contained ${{ matrix.bundled }} -p:PublishSingleFile=${{ matrix.singlefile }} --output ${{ matrix.os }}
- name: Copy external files
run: |
cp ./README.md ./${{ matrix.os }}
cp ./SCRIPTS.md ./${{ matrix.os }}
cp ./LICENSE.txt ./${{ matrix.os }}
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
- name: Create zip for stable release Windows GUI
run: |
7z a -tzip GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip ./${{ matrix.os }}/* -mx0
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}
path: GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip

6 changes: 4 additions & 2 deletions .github/workflows/publish_pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand All @@ -43,6 +43,7 @@ jobs:
cp ./README.md ./${{ matrix.os }}
cp ./SCRIPTS.md ./${{ matrix.os }}
cp ./LICENSE.txt ./${{ matrix.os }}
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
- name: Upload ${{ matrix.os }} GUI
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -74,7 +75,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore UndertaleModCli
- name: Build
Expand All @@ -85,6 +86,7 @@ jobs:
run: |
cp ./README.md ./CLI-${{ matrix.os }}/
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
- name: Upload ${{ matrix.os }} CLI
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Note, that you can update to the bleeding edge releases at any time from within

| Releases | Status |
|:---: |---------- |
| Stable | [![Latest Stable Release](https://img.shields.io/github/downloads/krzys-h/UndertaleModTool/0.5.1.0/total)](https://github.com/krzys-h/UndertaleModTool/releases/tag/0.5.1.0) |
| Stable | [![Latest Stable Release](https://img.shields.io/github/downloads/krzys-h/UndertaleModTool/0.6.1.0/total)](https://github.com/krzys-h/UndertaleModTool/releases/tag/0.6.1.0) |
| Bleeding edge | [![Latest Bleeding Edge](https://img.shields.io/github/downloads/krzys-h/UndertaleModTool/bleeding-edge/total)](https://github.com/krzys-h/UndertaleModTool/releases/tag/bleeding-edge) |

It's worth noting that UndertaleModTool has different builds per release. The differences are as follows:
Expand Down
2 changes: 1 addition & 1 deletion SCRIPTS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ They are relatively self-explanatory, but there are also some helpful general-pu
- `EnableDebug.csx`: Enables debug mode in Undertale/Deltarune.
- `FindAndReplace.csx`: Tool to find and replace GML code across an entire game.
- `GoToRoom.csx`: Enables a hotkey to warp to a supplied room ID in a game.
- `RunSwitchOnPC.csx`: Converts the Switch version of Undertale to run on PC (certain versions).
- `RunSwitchAndXboxOnPC.csx`: Converts the Switch and Xbox versions of Undertale to run on PC (certain versions).
- `Search.csx`: Tool to search the GML code across an entire game.
- `ShowRoomName.csx`: Enables an overlay to display the current room name and ID.
- `TTFFonts.csx`: Marks all fonts in Undertale to be externally loaded. Does not handle Japanese text.
Expand Down
2 changes: 1 addition & 1 deletion Underanalyzer
Submodule Underanalyzer updated 77 files
+200 −0 STRUCTURE.md
+1 −1 Underanalyzer/Decompiler/AST/ASTBuilder.cs
+1 −1 Underanalyzer/Decompiler/AST/ASTCleaner.cs
+64 −3 Underanalyzer/Decompiler/AST/ASTFragmentContext.cs
+1 −1 Underanalyzer/Decompiler/AST/ASTPrinter.cs
+1 −1 Underanalyzer/Decompiler/AST/BlockSimulator.cs
+6 −0 Underanalyzer/Decompiler/AST/IASTNode.cs
+2 −2 Underanalyzer/Decompiler/AST/IStatementNode.cs
+227 −0 Underanalyzer/Decompiler/AST/LocalScope.cs
+9 −0 Underanalyzer/Decompiler/AST/Nodes/ArrayInitNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/AssetReferenceNode.cs
+76 −4 Underanalyzer/Decompiler/AST/Nodes/AssignNode.cs
+7 −0 Underanalyzer/Decompiler/AST/Nodes/BinaryNode.cs
+7 −2 Underanalyzer/Decompiler/AST/Nodes/BlockLocalVarDeclNode.cs
+134 −19 Underanalyzer/Decompiler/AST/Nodes/BlockNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/BooleanNode.cs
+7 −2 Underanalyzer/Decompiler/AST/Nodes/BreakNode.cs
+8 −0 Underanalyzer/Decompiler/AST/Nodes/ConditionalNode.cs
+7 −2 Underanalyzer/Decompiler/AST/Nodes/ContinueNode.cs
+12 −2 Underanalyzer/Decompiler/AST/Nodes/DoUntilLoopNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/DoubleNode.cs
+11 −2 Underanalyzer/Decompiler/AST/Nodes/EnumDeclNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/EnumValueNode.cs
+7 −2 Underanalyzer/Decompiler/AST/Nodes/ExitNode.cs
+19 −2 Underanalyzer/Decompiler/AST/Nodes/ForLoopNode.cs
+20 −2 Underanalyzer/Decompiler/AST/Nodes/FunctionCallNode.cs
+28 −5 Underanalyzer/Decompiler/AST/Nodes/FunctionDeclNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/FunctionReferenceNode.cs
+17 −2 Underanalyzer/Decompiler/AST/Nodes/IfNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/InstanceTypeNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/Int16Node.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/Int32Node.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/Int64Node.cs
+49 −0 Underanalyzer/Decompiler/AST/Nodes/LocalVarDeclNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/MacroValueNode.cs
+22 −2 Underanalyzer/Decompiler/AST/Nodes/NewObjectNode.cs
+7 −0 Underanalyzer/Decompiler/AST/Nodes/NullishCoalesceNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/PredefinedDoubleNode.cs
+13 −2 Underanalyzer/Decompiler/AST/Nodes/RepeatLoopNode.cs
+9 −3 Underanalyzer/Decompiler/AST/Nodes/ReturnNode.cs
+9 −0 Underanalyzer/Decompiler/AST/Nodes/ShortCircuitNode.cs
+8 −2 Underanalyzer/Decompiler/AST/Nodes/StaticInitNode.cs
+5 −0 Underanalyzer/Decompiler/AST/Nodes/StringNode.cs
+13 −2 Underanalyzer/Decompiler/AST/Nodes/StructNode.cs
+8 −2 Underanalyzer/Decompiler/AST/Nodes/SwitchCaseNode.cs
+9 −2 Underanalyzer/Decompiler/AST/Nodes/SwitchNode.cs
+14 −2 Underanalyzer/Decompiler/AST/Nodes/ThrowNode.cs
+33 −4 Underanalyzer/Decompiler/AST/Nodes/TryCatchNode.cs
+6 −0 Underanalyzer/Decompiler/AST/Nodes/UnaryNode.cs
+26 −2 Underanalyzer/Decompiler/AST/Nodes/VariableCallNode.cs
+12 −2 Underanalyzer/Decompiler/AST/Nodes/VariableHashNode.cs
+79 −14 Underanalyzer/Decompiler/AST/Nodes/VariableNode.cs
+38 −26 Underanalyzer/Decompiler/AST/Nodes/WhileLoopNode.cs
+13 −2 Underanalyzer/Decompiler/AST/Nodes/WithLoopNode.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/BinaryBranch.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/Block.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/BreakNode.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/ContinueNode.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/DoUntilLoop.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/EmptyNode.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/ExitNode.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/Fragment.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/Nullish.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/RepeatLoop.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/ReturnNode.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/ShortCircuit.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/StaticInit.cs
+4 −4 Underanalyzer/Decompiler/ControlFlow/Switch.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/TryCatch.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/WhileLoop.cs
+1 −1 Underanalyzer/Decompiler/ControlFlow/WithLoop.cs
+3 −2 Underanalyzer/Decompiler/DecompileContext.cs
+6 −0 Underanalyzer/Decompiler/DecompileSettings.cs
+4 −2 Underanalyzer/VMData.cs
+1,694 −0 UnderanalyzerTest/DecompileContext.DecompileToString.Locals.cs
+115 −0 UnderanalyzerTest/DecompileContext.DecompileToString.Settings.cs
+129 −6 UnderanalyzerTest/DecompileContext.DecompileToString.cs
3 changes: 2 additions & 1 deletion UndertaleModCli/Program.UMTLibInherited.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -589,7 +590,7 @@ public bool LintUMTScript(string path)
{
CancellationTokenSource source = new CancellationTokenSource(100);
CancellationToken token = source.Token;
CSharpScript.EvaluateAsync(File.ReadAllText(path), CliScriptOptions, this, typeof(IScriptInterface), token);
CSharpScript.EvaluateAsync(File.ReadAllText(path, Encoding.UTF8), CliScriptOptions.WithFilePath(path).WithFileEncoding(Encoding.UTF8), this, typeof(IScriptInterface), token);
}
catch (CompilationErrorException exc)
{
Expand Down
12 changes: 7 additions & 5 deletions UndertaleModCli/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public Program(FileInfo datafile, FileInfo[] scripts, FileInfo output, bool verb
typeof(JsonConvert).GetTypeInfo().Assembly,
typeof(System.Text.RegularExpressions.Regex).GetTypeInfo().Assembly,
typeof(TextureWorker).GetTypeInfo().Assembly,
typeof(ImageMagick.MagickImage).GetTypeInfo().Assembly,
typeof(Underanalyzer.Decompiler.DecompileContext).Assembly)
// "WithEmitDebugInformation(true)" not only lets us to see a script line number which threw an exception,
// but also provides other useful debug info when we run UMT in "Debug".
Expand Down Expand Up @@ -658,7 +659,8 @@ private void DumpAllTextures()
{
if (Verbose)
Console.WriteLine($"Dumping {texture.Name}");
File.WriteAllBytes($"{directory}/{texture.Name.Content}.png", texture.TextureData.TextureBlob);
using FileStream fs = new($"{directory}/{texture.Name.Content}.png", FileMode.Create);
texture.TextureData.Image.SavePng(fs);
}
}

Expand Down Expand Up @@ -701,7 +703,7 @@ private void ReplaceTextureWithFile(string textureEntry, FileInfo fileToReplace)
if (Verbose)
Console.WriteLine("Replacing " + textureEntry);

texture.TextureData.TextureBlob = File.ReadAllBytes(fileToReplace.FullName);
texture.TextureData.Image = GMImage.FromPng(File.ReadAllBytes(fileToReplace.FullName));
}

/// <summary>
Expand All @@ -713,7 +715,7 @@ private void RunCSharpFile(string path)
string lines;
try
{
lines = File.ReadAllText(path);
lines = File.ReadAllText(path, Encoding.UTF8);
}
catch (Exception exc)
{
Expand All @@ -740,7 +742,7 @@ private void RunCSharpCode(string code, string scriptFile = null)

try
{
CSharpScript.EvaluateAsync(code, CliScriptOptions, this, typeof(IScriptInterface)).GetAwaiter().GetResult();
CSharpScript.EvaluateAsync(code, CliScriptOptions.WithFilePath(scriptFile ?? "").WithFileEncoding(Encoding.UTF8), this, typeof(IScriptInterface)).GetAwaiter().GetResult();
ScriptExecutionSuccess = true;
ScriptErrorMessage = "";
}
Expand Down Expand Up @@ -870,4 +872,4 @@ private void ProgressUpdater()
Thread.Sleep(100); //10 times per second
}
}
}
}
4 changes: 2 additions & 2 deletions UndertaleModCli/UndertaleModCli.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
<Nullable>disable</Nullable>
<RollForward>LatestMajor</RollForward>
Expand All @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.10.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
Expand Down
33 changes: 30 additions & 3 deletions UndertaleModLib/Compiler/AssemblyWriter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2169,7 +2169,15 @@ private static void AssembleVariablePush(CodeWriter cw, Parser.Statement e, out
cw.typeStack.Push(DataType.Variable);
if (notLast)
{
cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
if (CompileContext.GMS2_3)
{
cw.typeStack.Pop();
cw.Emit(Opcode.PushI, DataType.Int16).Value = (short)-9; // stacktop conversion
}
else
{
cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
}
}
else
isArray = true;
Expand All @@ -2190,7 +2198,15 @@ private static void AssembleVariablePush(CodeWriter cw, Parser.Statement e, out
cw.typeStack.Push(DataType.Variable);
if (next + 1 < e.Children.Count)
{
cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
if (CompileContext.GMS2_3)
{
cw.typeStack.Pop();
cw.Emit(Opcode.PushI, DataType.Int16).Value = (short)-9; // stacktop conversion
}
else
{
cw.Emit(Opcode.Conv, cw.typeStack.Pop(), DataType.Int32);
}
}
}
}
Expand Down Expand Up @@ -2464,7 +2480,18 @@ private static void AssembleStoreVariable(CodeWriter cw, Parser.Statement s, Dat
VarType = s.Children[next].Children.Count != 0 ? VariableType.Array : VariableType.StackTop
});
if (next + 1 < s.Children.Count)
cw.Emit(Opcode.Conv, DataType.Variable, DataType.Int32);
{
if (CompileContext.GMS2_3)
{
cw.typeStack.Pop();
cw.Emit(Opcode.PushI, DataType.Int16).Value = (short)-9; // stacktop conversion
cw.typeStack.Push(DataType.Int32);
}
else
{
cw.Emit(Opcode.Conv, DataType.Variable, DataType.Int32);
}
}
}
if (!skip)
cw.typeStack.Pop();
Expand Down
2 changes: 0 additions & 2 deletions UndertaleModLib/Compiler/Lexer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,6 @@ private static Token ReadIdentifier(CodeReader cr)
"globalvar" => new Token(Token.TokenKind.KeywordGlobalVar, cr.GetPositionInfo(index)),
"return" => new Token(Token.TokenKind.KeywordReturn, cr.GetPositionInfo(index)),
"default" => new Token(Token.TokenKind.KeywordDefault, cr.GetPositionInfo(index)),
"struct" => new Token(Token.TokenKind.KeywordStruct, cr.GetPositionInfo(index)),
"function" when CompileContext.GMS2_3 => new Token(Token.TokenKind.KeywordFunction, cr.GetPositionInfo(index)),
"throw" when CompileContext.GMS2_3 => new Token(Token.TokenKind.KeywordThrow, cr.GetPositionInfo(index)),
"constructor" when CompileContext.GMS2_3 => new Token(Token.TokenKind.KeywordConstructor, cr.GetPositionInfo(index)),
Expand Down Expand Up @@ -844,7 +843,6 @@ public enum TokenKind
KeywordExit,
KeywordBreak,
KeywordContinue,
KeywordStruct, // Apparently this exists
KeywordFunction,
KeywordThrow,
KeywordConstructor,
Expand Down
1 change: 0 additions & 1 deletion UndertaleModLib/Compiler/Parser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3134,7 +3134,6 @@ private static bool IsKeyword(TokenKind t)
TokenKind.KeywordIf,
TokenKind.KeywordRepeat,
TokenKind.KeywordReturn,
TokenKind.KeywordStruct,
TokenKind.KeywordSwitch,
TokenKind.KeywordThen,
TokenKind.KeywordUntil,
Expand Down
Loading

0 comments on commit 828f4d0

Please sign in to comment.