Squashed commit of the following: commit abde76e295233d5016231a15e3eae7d17e50a79a Author: James King <james.king@facepunchstudios.com> Date: Mon Dec 12 16:39:43 2022 +0000 Fixed finding substitutions for generic parameters commit 44dd2550bcc88feff936ea770e8ed78a0f930599 Author: James King <james.king@facepunchstudios.com> Date: Mon Dec 12 14:16:08 2022 +0000 AreEquivalentTypes(old, new) refactor commit 3d50bd934dac1a96962c5bdc4571bc2959e73f8e Author: James King <james.king@facepunchstudios.com> Date: Mon Dec 12 14:15:44 2022 +0000 Fixed AreEqualTypes when exactly one param is null commit 4aa2e90f38ca7c5a31ffbd426e68468c33613328 Author: James King <james.king@facepunchstudios.com> Date: Mon Dec 12 14:02:15 2022 +0000 Organised and documented delegate hotloading tests commit f0ecfff2f59fbe84d67542077e60dccdd6cbdb2e Author: James King <james.king@facepunchstudios.com> Date: Mon Dec 12 12:34:34 2022 +0000 Added failing generic delegate test commit 9813c1b43ec3aa0400071c5597f5494f9809bcad Author: James King <james.king@facepunchstudios.com> Date: Fri Dec 9 12:07:16 2022 +0000 GetNewType consistency Now returns null to mean a substitution couldn't be found commit bd4602be39855f0726d67fbca3455b53f4ea1a7f Author: James King <james.king@facepunchstudios.com> Date: Fri Dec 9 11:37:46 2022 +0000 Fix upgrading lambda display class instances that are found in the wild commit a39847fea77570d4c6651ca22b03484e386b83f2 Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 19:25:10 2022 +0000 Fixed ResolveMethod() with a static constructor ref commit 34e54eab8089083f03c013d1133c1395bf97ee4d Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 19:24:13 2022 +0000 Fixed IsMatchingType(typeRef, type) with nested types commit 5a0725c233052d8a1941bb7bd724340557fba534 Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 19:22:47 2022 +0000 Stop expecting every method to have a scope ordinal commit e806ebdfc172436ad22395be5633188fe6e7aeb6 Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 18:54:26 2022 +0000 Fixed finding scope method ordinals of static constructors commit a23782634226ac1965db29d6e0ecf79431a982ee Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 18:49:21 2022 +0000 Failing hotload tests for lambdas in static constructors commit f4bf0f1db69a284939f5c89e98fa9e633a4d0bb1 Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 17:26:30 2022 +0000 Cleanup commit 65193611b12b547bf794893bbd9128fa369de58b Author: James King <james.king@facepunchstudios.com> Date: Thu Dec 8 17:25:30 2022 +0000 Implemented a simple assembly resolver for Tools Allows hotload to make more valid substitutions commit 585bcbe6ee4dc7069704698cd64640f3e239744a Author: Matt Stevens <matt@mattstevens.co.uk> Date: Mon Dec 12 18:40:06 2022 +0000 Add -noamsi command line parameter for testing commit 0403c9883f16ecf9bb4cce413c8ed98643f6f1ec Merge: 7471387c3f 16cbcf8ec4 Author: EzMeowFP <ezmeow@facepunchstudios.com> Date: Tue Dec 13 02:29:15 2022 +0900 Merge branch 'master' of sbox commit 7471387c3f43448c4691ba4402d8bd90d32f3d43 Author: EzMeowFP <ezmeow@facepunchstudios.com> Date: Tue Dec 13 02:29:08 2022 +0900 props updates - disabling baking light on some asset in the prefabs - moved aircon and trash bin breakable piece to embed, adjusted placement/pivot of the gibs - dirt pass on dead end road sign/material - collider/ Lod adjustment commit 16cbcf8ec40c2e738e3c257b599dbc5c5500b97c Author: Maxime Lebled <ml.maxofs2d@gmail.com> Date: Mon Dec 12 17:07:17 2022 +0100 Recompiled content under /addons/citizen/ commit fc407123ec9fb3a6349d2defff3d3cccfb5b4f96 Author: Matt Stevens <matt@mattstevens.co.uk> Date: Mon Dec 12 15:18:07 2022 +0000 Revert "Only create resource dependency on texture .meta if it exists" This reverts commit 55e57df69e0f6335962a5923ef956b658e9e7393. commit 55e57df69e0f6335962a5923ef956b658e9e7393 Author: Matt Stevens <matt@mattstevens.co.uk> Date: Mon Dec 12 15:09:28 2022 +0000 Only create resource dependency on texture .meta if it exists commit ab33d75d66d1940b796952e196832a627670f294 Author: Maxime Lebled <ml.maxofs2d@gmail.com> Date: Mon Dec 12 15:53:50 2022 +0100 Taken delivery of crate. commit 50ed28d7a4e956aa73b82ce2216e468d0967046d Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 14:22:27 2022 +0000 Diagnostic event for start to end code iteration timings commit d85cf33d5baffad2a7fad0c742ae9d2614756799 Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 13:32:01 2022 +0000 TypeLibrary logging commit e8d624c100f114a2aee43a3ab751a6a8f08677c4 Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 13:14:48 2022 +0000 Logging in CompileGroup commit 937e1bd03110d606c6864f6e6a5b161fad738e64 Author: DanduwFP <daniel@facepunchstudios.com> Date: Mon Dec 12 14:18:57 2022 +0000 Adjustments to Clothing AO Pretty much just been adjusting the ao in the material editor so the AO shows up abit more nicely on some clothing pieces. Crate has been delivered. commit 44079b86d852692fbeef7cef1af27a876bfc20fc Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 12:26:50 2022 +0000 Add logging menu to editor, can switch Trace/Detailed logging on https://files.facepunch.com/garry/88a623bf-7fcd-4245-bf05-13ae6da6f5d9.png commit f997317d22ca3cbab92561201bd19ed0f243a170 Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 12:24:26 2022 +0000 Add names for other runtime textures to aid debugging commit 618c92339120f9bd933f76bcd2e936e92b1bdc6b Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 12:23:46 2022 +0000 SkiaTextBlock will update the texture instead of disposing and creating a new one commit 397dc8b7469c62edc5ba9ffe4716197c110238c3 Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 12:20:41 2022 +0000 Texture.Update doesn't crash with wrong sized data, can update the first mip only, will generate the other mipmaps if only updating the first mip commit 7b447de6ed76adb7252cab9ffa6d31861182e1c9 Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 09:57:28 2022 +0000 Remove the rest of the log tags commit 2f2a2b867e6aecda3797f1042b63b7a53938be71 Author: Garry Newman <garrynewman@users.noreply.github.com> Date: Mon Dec 12 09:32:04 2022 +0000 Remove log tags commit fc42fd0f0a8378eb3cbcfb950156ee6e358fb7e0 Author: Tony Ferguson <devultj@gmail.com> Date: Sun Dec 11 23:36:45 2022 +0000 Made DamageInfo.Tags public