New encounters WIP #1032
Draft
New encounters WIP #1032
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit e82ecb5 Author: Alexander Egard <[email protected]> Date: Wed Oct 23 21:28:01 2024 +0200 More lifetimes, test passes commit bc8b998 Author: Alexander Egard <[email protected]> Date: Tue Oct 22 00:29:53 2024 +0200 Update CultureObjectRegistry.cs commit 0a821cc Merge: f9970f0 3233dbe Author: Alexander Egard <[email protected]> Date: Tue Oct 22 00:00:29 2024 +0200 Merge branch 'development' into SettlementFields commit f9970f0 Author: Alexander Egard <[email protected]> Date: Fri Oct 11 13:29:30 2024 +0200 Update GameObjectCreator.cs commit 7ce6410 Merge: 23480be baeef2b Author: Alexander Egard <[email protected]> Date: Fri Oct 11 13:29:09 2024 +0200 Merge branch 'development' into SettlementFields commit 23480be Author: EgardA <[email protected]> Date: Wed Sep 25 22:59:21 2024 +0200 some test stuff commit f65e5e8 Merge: d436c25 8545df8 Author: EgardA <[email protected]> Date: Wed Sep 25 21:02:49 2024 +0200 Merge branch 'development' into SettlementFields commit d436c25 Merge: 08e1653 e18f320 Author: EgardA <[email protected]> Date: Wed Sep 25 20:39:57 2024 +0200 Merge branch 'development' into SettlementFields commit 08e1653 Author: EgardA <[email protected]> Date: Tue Sep 24 15:57:39 2024 +0200 Who knows commit 4f00d47 Author: EgardA <[email protected]> Date: Mon Sep 23 15:07:32 2024 +0200 TextObject Surrogate commit 5b5376d Author: Garrett Luskey <[email protected]> Date: Sun Sep 22 17:44:07 2024 -0500 Update SurrogateCollection.cs commit 65874a7 Merge: a59798f 14b5ace Author: Garrett Luskey <[email protected]> Date: Sun Sep 22 17:25:05 2024 -0500 Merge branch 'autosync-bug-fix' into SettlementFields commit 14b5ace Author: Garrett Luskey <[email protected]> Date: Sun Sep 22 17:24:18 2024 -0500 fix for tests commit a59798f Merge: 9be3c4f 3a6a10a Author: EgardA <[email protected]> Date: Sun Sep 22 23:10:40 2024 +0200 Merge branch 'development' into SettlementFields commit 9be3c4f Author: EgardA <[email protected]> Date: Sun Sep 22 23:09:06 2024 +0200 upd commit 639d162 Author: EgardA <[email protected]> Date: Sun Sep 22 10:49:18 2024 +0200 Update SettlementFieldTests.cs commit 02650ed Merge: 9d86679 35f827c Author: EgardA <[email protected]> Date: Sun Sep 22 10:36:58 2024 +0200 Merge branch 'development' into SettlementFields commit 9d86679 Author: EgardA <[email protected]> Date: Sun Sep 22 02:28:05 2024 +0200 Update SettlementFieldTests.cs commit 3d43213 Author: EgardA <[email protected]> Date: Sun Sep 22 00:52:47 2024 +0200 Cleaned a lil bit commit 78168bd Author: EgardA <[email protected]> Date: Wed Sep 18 21:31:18 2024 +0200 WIP
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Checklist
Please check if your PR fulfills the following requirements:
PR Type
What kind of change does this PR introduce?
What is the current behavior?
What is the new behavior?
Resolves #
Other information