Commit graph

49 commits

Author SHA1 Message Date
Mag-nus
dfafa2f026
Few more minor bug fixes with the help of Claude (#4471) 2026-08-03 11:48:25 +00:00
Mag-nus
5385d19d6b
Bug fixes 1 (#4470)
* adapter fixes

* entity fixes
2026-07-29 13:03:21 -04:00
Ty Conner
565535623d
v1.77 (#4456)
* v1.77

* Update appveyor.yml

* Update appveyor.yml
2026-06-20 15:02:27 -04:00
Ty Conner
39ee90b461
Suppress Log4Net issue (#4454)
GHSA-4f7c-pmjv-c25w

<https://github.com/advisories/GHSA-4f7c-pmjv-c25w>
2026-06-16 12:16:22 -04:00
dependabot[bot]
a7e7adda62
Bump MySqlConnector from 2.5.0 to 2.6.0 (#4453)
---
updated-dependencies:
- dependency-name: MySqlConnector
  dependency-version: 2.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-06-14 16:02:33 -04:00
gmriggs
c420312a89
.net10 build (#4392)
* .net10 build

* update appveyor version

* update appveyor vs version

* Update appveyor.yml

* Update ACE.Server.csproj

* Update PacketHeaderOptional.cs

* Update .vsconfig

* Update ACE.Adapter.csproj

* Update ACE.Common.csproj

* Update ACE.Database.Tests.csproj

* Update ACE.Database.csproj

* Update ACE.DatLoader.Tests.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Entity.csproj

* Update ACE.Server.Tests.csproj

* Update ACE.Server.csproj

* Update ACE.Database.csproj

* Update Dockerfile

* Update ACE.Common.csproj

* Update ACE.Database.Tests.csproj

* Update ACE.Database.csproj

* Update ACE.DatLoader.Tests.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Server.Tests.csproj

* Update SphereTests.cs

* Update AppVeyor config

Suppress NETSDK1233 warnings for now

* Update AppVeyorBuild.bat

* Update ACE.sln

* Update appveyor.yml

* Update appveyor.yml

* Update appveyor.yml

* Update README.md

---------

Co-authored-by: Ty Conner <tyconner@itcproductions.com>
2026-02-15 13:41:34 -05:00
dependabot[bot]
d736e7c3de
Bump Microsoft.EntityFrameworkCore and 2 others (#4338)
* Bump Microsoft.EntityFrameworkCore and 2 others

Bumps Microsoft.EntityFrameworkCore from 8.0.13 to 8.0.18
Bumps System.Drawing.Common from 8.0.13 to 8.0.18
Bumps System.Text.Json from 8.0.5 to 8.0.6

---
updated-dependencies:
- dependency-name: Microsoft.EntityFrameworkCore
  dependency-version: 8.0.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: System.Drawing.Common
  dependency-version: 8.0.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: System.Text.Json
  dependency-version: 8.0.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update ACE.Adapter.csproj

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ty Conner <tyconner@itcproductions.com>
2025-07-15 13:56:07 -04:00
Ty Conner
f567d9d918
Update latest nugets (#4237) 2024-10-24 14:00:54 -04:00
dependabot[bot]
8c6f7a0bd4
Bump System.Text.Json from 8.0.3 to 8.0.4 in /Source (#4201) 2024-07-16 05:32:04 +00:00
dependabot[bot]
7a9121a9f8
Bump System.Text.Json from 6.0.9 to 8.0.3 in /Source (#4135) 2024-04-24 17:52:42 +00:00
Ty Conner
47f23e2014
Switch to net8 (#4059)
* Switch to net8

* Update appveyor.yml

* Update appveyor.yml

* Update appveyor.yml

* Update appveyor.yml

* Update appveyor.yml

* Create AppVeyorInit.ps1

* Update appveyor.yml

* Delete AppVeyorInit.ps1

* Create AppVeyorInstall.ps1

* Update appveyor.yml

* Update Dockerfile.arm64

* Update Dockerfile

* Update appveyor.yml

* Update ACE.Adapter.csproj

* Update ACE.Common.csproj

* Update ACE.Database.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Server.csproj

* Update copyrights

* Update DeveloperContentCommands.cs

* Update DeveloperFixCommands.cs

* Update ACE.Database.csproj

* Update ACE.Database.csproj

* Update ACE.Common.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Common.csproj

* Update ACE.Server.csproj

* Update ACE.Server.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Server.csproj

* Update ACE.DatLoader.csproj
2024-04-24 13:24:41 -04:00
Ty Conner
7e72ac041d
Fix issue with OOBE Setup (#4078) 2023-12-29 12:40:32 -05:00
Ty Conner
12e569652f
Switch to System.Text.Json (#4002)
* Switch to System.Text.Json

Removed Newtonsoft.Json and DouglasCrockford.JsMin

* Update GameConfiguration.cs

* Update MasterConfiguration.cs

* Update ThreadConfiguration.cs

* Update StarterSpell.cs

* Update StarterGearFactory.cs

* Update Program_Setup.cs

* Update LifestonedConverter.cs

* Update Program_Setup.cs

* Update Program_Setup.cs

* Update ACE.Adaptor

Shift JSON weenie [de]serialization to System.Text.Json

* Update LifestonedConverter.cs

* Update StarterGearFactory.cs

* Update ACE.Server.csproj

* Update ACE.Server.Tests.csproj

* Update Program.cs

* Update MySqlConfiguration.cs

* Update DDDConfiguration.cs

* Update ModContainer.cs

* Update ModManager.cs

* Update ModMetadata.cs

* Update ModMetadata.cs
2023-12-21 14:15:38 -05:00
dependabot[bot]
7ae63d9586
Bump Newtonsoft.Json from 13.0.2 to 13.0.3 in /Source (#3997) 2023-05-03 03:57:03 +00:00
dependabot[bot]
1eee05a0b6
Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /Source/ACE.Server.Tests (#3935) 2022-12-08 16:32:46 +00:00
Ty Conner
0c0ca9c7a4
Update to .NET6 (#3739)
* Update to .NET6

* Update dockerfiles to NET6

* Update appveyor.yml

* Update ACE.DatLoader.csproj

* Update Program_Setup.cs

* Update Program_DbUpdates.cs

* Update Program_DbUpdates.cs

* Update ACE.DatLoader.Tests.csproj

* Update ACE.Database.Tests.csproj

* Update ACE.Database.csproj

* Update ACE.Server.Tests.csproj

* Update ACE.Server.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Database.csproj

* Update ACE.Server.csproj

* Update EF packages to EFCore 6

Requires Database, Database.Tests and Adapater to target .NET6 framework

* Update ACE.Server.csproj

* Update ACE.Database.csproj

* Update Program_BinUpdates.cs

* Update AccountExtensions.cs

* update nugets

* Remove TimeZoneConverter

net6 includes built in functionality

* update csproj files

* Update ACE.Server.csproj
2022-07-13 12:30:32 -04:00
Mag-nus
d0b75cc69a
Update EF Nuget Packages (#3750)
* Update EF Nuget Packages

This requires ACE.Adapter and ACE.Database to be updated from .net standard 2.0 to 2.1

* Update ACE.Database.csproj

* fix merge
2021-12-01 10:13:52 -06:00
Mag-nus
afb7a60dd3
Update NonEF Nuget Packages (#3749) 2021-11-28 19:13:51 -06:00
Ty Conner
880c031102
Update SQL Writer output (#3694)
* Update SQL Writer output

* Update SQLWriter.cs

* Add PacketOpCodeNames

* Update PropertyInt.cs

* Update PropertyInt.cs
2021-10-18 21:33:27 -04:00
Ty Conner
5b1b6e3ea5
Add some null returns to GDLELoader (#3036)
* Add some null returns to GDLELoader

* Apply suggestions from code review

Co-authored-by: gmriggs <gmriggs@gmail.com>

Co-authored-by: gmriggs <gmriggs@gmail.com>
2020-06-21 22:02:05 -04:00
Ty Conner
3250502a9a
Update Adapter for use with parser tool (#3028) 2020-06-18 14:21:44 -04:00
Ty Conner
59435ca20a
Fix issue with Recipe conversions (#2967) 2020-05-08 01:44:36 -04:00
gmriggs
de9de74416
adding reguid support for json landblock conversion w/ relative guids (#2895) 2020-04-11 12:47:44 -04:00
Ty Conner
3c5a7d18d2
Support ARM64 (RPI4 4gb - Ubuntu x64) (#2853)
* Support ARM64 (RPI4 4gb - Ubuntu x64)

* Update appveyor.yml
2020-03-24 00:58:12 -04:00
gmriggs
5af19db270
fix missing e typo (#2821) 2020-03-15 16:54:34 -04:00
Mag-nus
68ea65bf91
Remove .net standard 2.1 from Adatper and Database (#2770)
Not sure why they were 2.1.

2.0 is the latest that's supported by desktop apps. Moving these two libraries back to 2.0 makes them easier to consume.
2020-03-06 06:43:25 -06:00
gmriggs
592a19dd7b
improved json landblock export (#2741)
* improved json landblock export

* .

* .
2020-02-27 15:04:08 -05:00
Ty Conner
96e0507081
Updating project files (#2707)
* Update ACE.Server.csproj

* Update ACE.Server.csproj

* Update ACE.Server.csproj

* Update ACE.Adapter.csproj

* Update ACE.Common.csproj

* Update ACE.Database.Tests.csproj

* Update ACE.Database.csproj

* Update ACE.DatLoader.Tests.csproj

* Update ACE.DatLoader.csproj

* Update ACE.Entity.csproj

* Update ACE.Server.Tests.csproj

* icon stuff

* Move artwork to its own folder

* .

* update to log4net config

* Setup OOB build for log4net config file

* Update for out of box configuration on console

* test compile datetime

* test 2

* test compile date three

* Update AppVeyorBeforeCompile.bat

* Update GetServerVersionHandler.cs

* version info final

* Delete log4net.config

* .

* Update ACE.Server.csproj

* Update .gitignore
2020-02-23 17:58:20 -05:00
gmriggs
da2c3df688
adding quest support to import-json and import-sql (#2694)
* add support for recipes to DeveloperContentCommands

* adding landblock instance support to import-sql and import-json

* fixing spelling

* updating json landblock key

* adding quest support to import-json and import-sql

* fixing bug in original GDLEConverter.TryConvert() for reading landblock json

* adding comment

* removing duplicate code from merge
2020-02-12 12:45:27 -05:00
gmriggs
f662226b62
adding landblock instance support to import-sql and import-json (#2683)
* add support for recipes to DeveloperContentCommands

* adding landblock instance support to import-sql and import-json

* fixing spelling

* updating json landblock key

* fixing bug in original GDLEConverter.TryConvert() for reading landblock json
2020-02-12 04:43:53 -05:00
gmriggs
97ef273a73
add support for recipes to DeveloperContentCommands (#2664) 2020-02-12 03:31:38 -05:00
Ty Conner
e417d8934b
Wire up adaptor support for wieldedTreasure.json, region.json and encounters.json (#2628)
* Wire up adaptor support for wieldedTreasure.json, region.json and encounters.json

* cleanup

* Update Creature.cs
2020-02-12 00:45:47 -05:00
Mag-nus
c5ea7cc3b2
.NET Core 3.1 (#2329)
* Update TargetFrameworks and PackageReferences

* FromSql -> FromSqlRaw, ExecuteSqlCommand -> ExecuteSqlRaw

* Client side GroupBy is not supported in EF 3.0

* Update appveyor.yml

* readme updates

* Add NoTracking

* scaffolding notes update

* Revert back to EF Core 2.2

* EF Core 2.2.0 -> 2.2.6

* Update packages (Except EF Core)

* .net core 3.0 -> 3.1 (LTS)

* Update NuGet packages

* Update README.md

* Update appveyor.yml to use VS Preview

* Update appveyor.yml

* Update README_linux.md

Co-authored-by: Ty Conner <tyconner@itcproductions.com>
2020-01-06 06:00:00 -06:00
gmriggs
3dae8c285e
improved handling for json weenie metadata (#2572)
* improved handling for json weenie metadata

* adding missing file
2019-12-31 02:01:19 -05:00
Ty Conner
cda2ab9aa3
Update ACE.Adapter to support spawn maps (#2445)
* Update ACE.Adapter to support spawn maps

* Update GDLELoader.cs

* Update GDLELoader.cs
2019-11-21 00:01:06 -06:00
Ty Conner
2d87ef74e3
Add full support for Contracts (#2150)
* Add full support for Contracts

* Update Commands

* Update ContractManager.cs

* Update DeveloperCommands.cs

* Update ContractManager.cs

Fix PackableHashTable stuff

* Update ContractTracker.cs

Add in vaguely used Stamped version

* Update ContractManager.cs

* Update ContractManager.cs

* Some tweaks

* More tweaking

* Create ContractId.cs

* Update PropertyInt.cs

* Update ContractId.cs

* Provide feedback for IsFull

* Update QM to prevent Update from writing more solves than max allows

* null catch

* .

* Update LifestonedConverter.cs

* Update Gem.cs

* Update changelog.md

* Update changelog.md
2019-07-28 22:25:22 -05:00
Mag-nus
2e8d351ff7
Upgrade to .NET Core 2.2.1 (VS 2017 compatible) (#1833)
This also updates all other nuget packages to latest.

The EF database packages are updated to 2.2.0 because that is the latest pomelo (our database driver) currently supports.
2019-07-10 06:24:08 -05:00
Ty Conner
f344d85ca9
Fix issue with converting books from JSON to SQL. (#2065) 2019-07-01 04:09:09 -05:00
Ty Conner
8ccaf95977
Add ACE Weenie to LSD Weenie converter (#1859)
* Add ACE Weenie to LSD Weenie converter

* .
2019-05-06 22:48:50 -05:00
Ty Conner
f9ee96a5c1
Fix Recipe Issue (#1721)
* Fix minor issue with scrolls

* Fix scoping issue with Recipe Requirements and Mods

* Update changelog and readme
2019-04-13 15:07:09 -05:00
Mag-nus
4dab146548
Code cleanup (#1681)
* Flags attribute

* empty statement

* Fix Formatting

* Fix OrderBy -> ThenBy

* use OfType

* Replace with asingle call to Count(...)

* Replace with a single call to FirstOrDefault

* Merge cast with type check

* use String.IsNullOrEmpty

* use collections count property

* use format specifier (results in shorter loc)

* use Any() instead of Count() > 0

* revert ThenBy with comment
2019-04-10 20:48:34 -05:00
Ty Conner
4c3809faa8
Add support for GDLe recipe conversions (#1691)
* Update Crafting SQL Writer

* Add support for GDLe recipe conversion

* cleanup
2019-04-10 12:42:33 -05:00
Ty Conner
dad9d900a7
Remove sorting on Generator list (#1669)
* Remove sorting on Generator list

* Disallow WeenieId on TryConvert

* Update LifestonedConverter.cs
2019-04-08 01:36:03 -05:00
Ty Conner
105f6447a9
Fix issue with ClassName writer (#1668)
* Fix issue with ClassName writer

* .
2019-04-07 20:41:11 -05:00
Ty Conner
3dc023d200
Update LSD converter to support enum shifting (#1666)
* Update LSD converter to support enum shifting

* Add bool to Try Converts

* Update LSD DataModel

* Update Writer and Exporter
2019-04-07 19:56:56 -05:00
Mag-nus
616feed958
Assembly changes (#1369)
* Change child assemblies to AnyCPU. Ace.Server still x64

* Fix LifestonedConverter for > ushort.MaxValue weenies

* Allow DbContexts to be configured/used by other applications

* Make GetWeenie public

* SQLWriters should take IDictionary, not Dictionary

* Include links

* Keep tests as x64
2019-01-26 10:09:13 -06:00
Ty Conner
350edddcf6
World DB Changes (#1295)
* Minor PCAP commenting fix

* Remove Duplicated Data from Spell Table

* Update MySqlInstall.bat

* Update Recipe Mods table column Unknown1 to Source

* Update SpellProperties.cs

* Add spell-export

* cleanup

* Update code

* delete spell-export

* remove data that was redunant from dat

* Update CreateList and Generator labels

* Change Emote.Display to Bool

* Change Emote.Display to Bool

* Fix script

* update changelog

* Add some null checks

* More null check

* syntax error

* cleanup

* more cleanup

* Create db-pr-override.txt
2019-01-19 19:55:26 -06:00
Mag-nus
7e23a3b722
Gdle adapters (#1222)
* GDLE WorldSpawns loader/converter

GDLELoader.TryLoadWorldSpawnsConverted(@"C:\ACE\data\gdle\worldspawns.json", out var instances, out var links);

* GDLE events supported

 GDLELoader.TryLoadEventsConverted(@"C:\ACE\data\gdle\events.json", out var events)

* GDLE quests supported

GDLELoader.TryLoadQuestsConverted(@"C:\ACE\data\gdle\quests.json", out var quests)

* cleanup Quests

* cleanup events

* Cleanup WorldSpawns

* GDLE Spells support

* Recipes initial

* Spells convert

GDLELoader.TryLoadRecipesConverted(@"C:\ACE\data\gdle\recipes.json", out var recipes)

Lots of todo notes here though

* Add the WeenieClassName enum to ACE.Entity.Enum

* Add Weenie.ClassName to LifestonedConverter

* TryLoadWorldSpawnsConverted Guid conversion

* Comment the AI indexes

* fix quest jsons with -1 MinDelta

* Fix - formula values for json spells (bugs)
2019-01-17 10:05:17 -06:00
Mag-nus
83d75c932b ACE.Adapter initial with Lifestoned json support (#1201)
* Initial checkin

* More adapter progress

* Good to go
2018-12-31 11:56:54 -06:00