Commit Graph

1187 Commits

Author SHA1 Message Date
CWX 49808c96ff Merge branch 'develop' into extra-props 2025-04-29 19:19:30 +01:00
clodan 2dd57a1080 Added Release extension of data for item and ups for modders to add extra properties 2025-04-29 19:02:14 +01:00
CWX ae39d6f579 Merge branch 'develop' into location-enum 2025-04-29 18:46:48 +01:00
Chris Adamson 9fb8b62630 remove logs 2025-04-29 12:45:36 -05:00
Chomp feb031bd8b Updated core config 2025-04-29 17:59:03 +01:00
Chris Adamson a446f039c9 location enum for fresh profiles 2025-04-29 11:44:25 -05:00
Chomp 8285a1e92d Updated PMC difficulty values 2025-04-29 17:31:31 +01:00
Chris Adamson de38f1fe88 try just the enum 2025-04-29 10:57:12 -05:00
Chomp 760f3e3c72 Revert "fixed error where itemlocation can be either a string or int" 2025-04-29 08:47:44 +01:00
Chomp 370de0250f Merge pull request #203 from hulkhan22/fix/cast-error
fix: Fix cast & filtering during elimination quest generation
2025-04-29 08:34:51 +01:00
hulkhan22 9357c1d2b9 Fix cast & filtering 2025-04-29 00:33:40 +02:00
Chris Adamson 723e616e80 fixes based on feedback 2025-04-28 12:43:11 -05:00
Chris Adamson 7ed081d305 fixed error where itemlocation can be either a string or int 2025-04-28 12:07:46 -05:00
Chris Adamson b431a7129a Merge branch 'develop' into bugfix/upd-lockable-2 2025-04-28 08:47:49 -05:00
Chomp c0760ce4c1 Return empty response object when no stash id found, allows client to continue 2025-04-28 09:43:33 +01:00
Chomp 0f2a3c5ab1 Cleaned up output response object code 2025-04-28 09:41:04 +01:00
Chris Adamson 8c0aab539b fix my previous fix 2025-04-27 19:24:16 -05:00
hulkhan22 5651d8355c Merge branch 'develop' into fix/cultist-circle-not-giving-reward 2025-04-28 00:24:01 +02:00
hulkhan22 294c879f11 Fix cultist circle not giving reward 2025-04-28 00:23:01 +02:00
hulkhan22 ac41596aef Convert to .GetValueOrDefault() 2025-04-27 21:43:24 +02:00
hulkhan22 53d3c7fcce Convert to .GetValueOrDefault() 2025-04-27 21:41:55 +02:00
hulkhan22 198fd5b4b7 Merge branch 'develop' into fix/turning-off-generator-stops-crafts2 2025-04-27 21:02:52 +02:00
hulkhan22 36a23f0d43 Revert nullable ref 2025-04-27 20:41:04 +02:00
hulkhan22 bf12e2f400 Fix productions not advancing without generator on 2025-04-27 20:36:26 +02:00
hulkhan22 2aee426983 Merge branch 'develop' into fix/turning-off-generator-stops-crafts 2025-04-27 19:02:10 +02:00
hulkhan22 3e4b87a2ac Fix hideout upgrade complete time calculation 2025-04-27 18:59:38 +02:00
Chomp 6bb905763f Merge pull request #189 from hulkhan22/chore/objects
chore: Change 'object' types into specific types #148
2025-04-27 08:36:26 +01:00
hulkhan22 850059416f Reverted data change 2025-04-27 02:45:59 +02:00
hulkhan22 b1fd4d2055 revert 2025-04-27 01:50:26 +02:00
hulkhan22 871ca63aaa More type changes 2025-04-27 01:39:21 +02:00
Chomp 3b41b551ca Renamed lock vars to match convention 2025-04-26 23:12:19 +01:00
Chomp 4ea4e4ed7c Merge pull request #188 from hulkhan22/fix/multithread-access-list
fix: Crash when generating bots / multithreading improvements #187
2025-04-26 23:10:16 +01:00
hulkhan22 baed8d2b90 Revert to a lock 2025-04-26 23:56:48 +02:00
hulkhan22 7e13c8c446 Revert "Fix"
This reverts commit ce97c1676198197b8c2a0ef75eaee7df869cb3bd.
2025-04-26 23:29:12 +02:00
hulkhan22 38f561b85d DogtagSide 2025-04-26 21:37:08 +02:00
hulkhan22 0e176aba5f Fix 2025-04-26 20:53:14 +02:00
hulkhan22 89c36650ca Objects 2025-04-26 19:33:35 +02:00
CWX 18fb3b5b16 Make Loaded configs static 2025-04-25 13:49:41 +01:00
Alex d7e67af662 Added dev and prod files for logger 2025-04-24 16:44:56 +01:00
Alex 222ca2e274 Replaced Serilog for custom logger 2025-04-24 16:29:36 +01:00
CWX 811bdadac0 Revert "remove output to screen, limit file logging"
This reverts commit 26a238c285590a8f24a789698391725321bc6da2.
2025-04-23 15:35:51 +01:00
CWX 690f9f3e83 Revert "Remove logging Requests"
This reverts commit d0aad46694ba2047b518ea1937a4b04a92b9a253.
2025-04-23 15:35:39 +01:00
CWX e5ce7c990a Revert "remove unused types"
This reverts commit d5efe329d41cbef89207a85783a16042430cc73b.
2025-04-23 15:35:32 +01:00
CWX bd2afcb1a0 remove unused types 2025-04-23 15:16:24 +01:00
CWX 1572a54f40 Remove logging Requests 2025-04-23 15:13:02 +01:00
CWX b0ff7bb595 remove output to screen, limit file logging 2025-04-23 10:20:30 +01:00
CWX 80747a16f6 Formatting 2025-04-22 16:00:23 +01:00
CWX 7ed3395e0f add build logging for statics Temp 2025-04-22 15:59:55 +01:00
CWX 7c7297f63c Code cleanup and format 2025-04-22 14:49:05 +01:00
CWX 8ba498a4bc Removed TraderAssortService use TraderHelper.GetTraderAssortsByTraderId 2025-04-22 14:36:28 +01:00