Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Map Event Sync (Includes MapEvents, recruitment, prisoners) #717

Draft
wants to merge 104 commits into
base: development
Choose a base branch
from
Draft

WIP: Map Event Sync (Includes MapEvents, recruitment, prisoners) #717

wants to merge 104 commits into from

Commits on Jul 5, 2023

  1. Troop Purchase synced

    @EgardA
    EgardA committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    61d6293 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Party recruitment synced

    @EgardA
    EgardA committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    3747ab0 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @garrettluskey
    garrettluskey committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    9c7694e View commit details
    Browse the repository at this point in the history

  2. Updated as per comments

    @EgardA
    EgardA committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    090c5c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. comment updates

    @EgardA
    EgardA committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    31b69cf View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Update MobilePartyRecruitmentHandler.cs

    @EgardA
    EgardA committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    b8fa9ed View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    811c45b View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    0910c09 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    2758b9a View commit details
    Browse the repository at this point in the history

  3. Update ClientMobilePartyRecruitmentHandler.cs

    @EgardA
    EgardA committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    90a2cbd View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    8054e6d View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2024

  1. TroopRecruitment works

    @EgardA
    EgardA committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    8c5d681 View commit details
    Browse the repository at this point in the history

  2. Cleaned up

    @EgardA
    EgardA committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    8fd0057 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Tests

    @EgardA
    EgardA committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    8ddcc04 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2024

  1. Update .gitignore

    @EgardA
    EgardA committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    ff93f55 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @garrettluskey
    garrettluskey committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    26933ae View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    031018a View commit details
    Browse the repository at this point in the history

  3. Revert "Update .gitignore" 

    This reverts commit ff93f55.
    @EgardA
    EgardA committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    66bf0df View commit details
    Browse the repository at this point in the history

  4. Updates

    @EgardA
    EgardA committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    0fbfa49 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    353a600 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2128cec View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Merge branch 'development' into MainPartyTroopRecruitment

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    cf9674b View commit details
    Browse the repository at this point in the history

  2. Updated

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    04a96db View commit details
    Browse the repository at this point in the history

  3. Fix

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    783232e View commit details
    Browse the repository at this point in the history

  4. Issues remaining

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    9f6962f View commit details
    Browse the repository at this point in the history

  5. Worked just before, not now

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    ce66c83 View commit details
    Browse the repository at this point in the history

  6. Works now, kind of

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    e06ddf5 View commit details
    Browse the repository at this point in the history

  7. Enable bandit conversations

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    841227f View commit details
    Browse the repository at this point in the history

  8. some additional routing, end battle still not working

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    753b122 View commit details
    Browse the repository at this point in the history

  9. End functionality, some issues remain

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    690501e View commit details
    Browse the repository at this point in the history

  10. MapEvent End Fixes

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    77f3cbb View commit details
    Browse the repository at this point in the history

  11. Disable Player-Player interaction

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    1279e94 View commit details
    Browse the repository at this point in the history

  12. Cleaned up

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    f668f77 View commit details
    Browse the repository at this point in the history

  13. Simplification

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    dfbb38e View commit details
    Browse the repository at this point in the history

  14. Cleaned up

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    87ba6cd View commit details
    Browse the repository at this point in the history

  15. Delete ComputeIsWaitingPatch - Copy - Copy.cs

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    8eee187 View commit details
    Browse the repository at this point in the history

  16. Create MapEventTests.cs

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    d8cc4e2 View commit details
    Browse the repository at this point in the history

  17. Updated according to comments

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    ccd9c04 View commit details
    Browse the repository at this point in the history

  18. Create DisableSiegeMapEvent.cs

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    ec8094d View commit details
    Browse the repository at this point in the history

  19. Improved MapEvents

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    bebd6d1 View commit details
    Browse the repository at this point in the history

  20. Revert "Merge branch 'MainPartyTroopRecruitment' into MapEventSync" 

    This reverts commit dd4c4ca, reversing
changes made to 35ea26e.
    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b445ec3 View commit details
    Browse the repository at this point in the history

  21. Fixed PrisonRoster updating crash

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b8ca5e2 View commit details
    Browse the repository at this point in the history

  22. Some updates

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    445ae99 View commit details
    Browse the repository at this point in the history

  23. Updated tests

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    14ebc20 View commit details
    Browse the repository at this point in the history

  24. Revert "Merge branch 'MainPartyTroopRecruitment' into MapEventSync" 

    This reverts commit 1685ec8, reversing
changes made to 246455b.
    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    5f58e37 View commit details
    Browse the repository at this point in the history

  25. Current

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    aa39fe3 View commit details
    Browse the repository at this point in the history

  26. TroopRoster Import

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a6040e2 View commit details
    Browse the repository at this point in the history

  27. Reworked TroopRecruitment, not fully functional yet

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    f61b8ee View commit details
    Browse the repository at this point in the history

  28. Works

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    9b33820 View commit details
    Browse the repository at this point in the history

  29. DisabledXPGain

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    1381e9e View commit details
    Browse the repository at this point in the history

  30. TakePrisoner

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    096517b View commit details
    Browse the repository at this point in the history

  31. Some stuff

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a8e1d14 View commit details
    Browse the repository at this point in the history

  32. Fixed some bad commits

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    fad44fc View commit details
    Browse the repository at this point in the history

  33. Updated old Clan Patches

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    9558338 View commit details
    Browse the repository at this point in the history

  34. updates

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    63a9211 View commit details
    Browse the repository at this point in the history

  35. Split Troop Recruitment into separate branch

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    13f948e View commit details
    Browse the repository at this point in the history

  36. Revert "Split Troop Recruitment into separate branch" 

    This reverts commit 5f3eddc.
    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    78aceae View commit details
    Browse the repository at this point in the history

  37. Update GameInterfaceModule.cs

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    6866af5 View commit details
    Browse the repository at this point in the history

  38. Update GameInterfaceModule.cs

    @EgardA
    EgardA committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    d643abe View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Update ObjectManager.cs

    @EgardA
    EgardA committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    193ca01 View commit details
    Browse the repository at this point in the history

  2. Fixed shenanigans

    @EgardA
    EgardA committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    8f4cc32 View commit details
    Browse the repository at this point in the history

  3. Update PlayerEncounterPatches.cs

    @EgardA
    EgardA committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    b4d2a3d View commit details
    Browse the repository at this point in the history

  4. Update ItemRosterPatch.cs

    @EgardA
    EgardA committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    0d85e16 View commit details
    Browse the repository at this point in the history

  5. Revert "Update PlayerEncounterPatches.cs" 

    This reverts commit b4d2a3d.
    @EgardA
    EgardA committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    ef10136 View commit details
    Browse the repository at this point in the history

  6. Back to functional

    @EgardA
    EgardA committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    f4c6165 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Updates

    @EgardA
    EgardA committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f446d72 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Fixed and updated naming

    @EgardA
    EgardA committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    d0f5d0c View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. SurrenderAlmostFunctional

    @EgardA
    EgardA committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    3941960 View commit details
    Browse the repository at this point in the history

  2. Update SurrenderPatch.cs

    @EgardA
    EgardA committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    ece72b2 View commit details
    Browse the repository at this point in the history

  3. Revert "Update SurrenderPatch.cs" 

    This reverts commit ece72b2.
    @EgardA
    EgardA committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    7c4a821 View commit details
    Browse the repository at this point in the history

  4. Revert "Revert "Update SurrenderPatch.cs"" 

    This reverts commit 7c4a821.
    @EgardA
    EgardA committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    09da752 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Surrender functional (with bug)

    @EgardA
    EgardA committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    597d1bc View commit details
    Browse the repository at this point in the history

  2. Create PlayerEscapeHandler.cs

    @EgardA
    EgardA committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    c7a36a7 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    db97860 View commit details
    Browse the repository at this point in the history

  2. Fixed Patches for rebase

    @EgardA
    EgardA committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    bdd90da View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    ed4e4b0 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. fix all crash relate to mobile party

    @thomas-soutif
    thomas-soutif committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9bb9669 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Merge branch '766-report-mobile-party-sync-conflict-between-2-modules… 

    …' into MapEventSync
    @EgardA
    EgardA committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f2a2582 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    3a42d25 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    b3b30a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    5a9bd75 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    bb39fb0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    4018f73 View commit details
    Browse the repository at this point in the history

  5. Updated to follow development(?)

    @EgardA
    EgardA committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    8745073 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    1de4a71 View commit details
    Browse the repository at this point in the history

  2. Update ChangeOwnerOfSettlementPatch.cs

    @EgardA
    EgardA committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    c556433 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. disabled problematic patch

    @garrettluskey
    garrettluskey committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    d469eae View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Updated to work with surrender (not completely)

    @EgardA
    EgardA committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    8a9042d View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    04f8bd4 View commit details
    Browse the repository at this point in the history

  2. removed old allowed instance

    @garrettluskey
    garrettluskey committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    27d7a13 View commit details
    Browse the repository at this point in the history

  3. updated patches to be more robust

    @garrettluskey
    garrettluskey committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    a888561 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed May 12, 2024
    Configuration menu
    Copy the full SHA
    7eab576 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed May 13, 2024
    Configuration menu
    Copy the full SHA
    30ccf21 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Changes

    @EgardA
    EgardA committed May 23, 2024
    Configuration menu
    Copy the full SHA
    da16e9d View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed May 24, 2024
    Configuration menu
    Copy the full SHA
    85a89a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    a4af735 View commit details
    Browse the repository at this point in the history

  2. Functional tests, non functional game

    @EgardA
    EgardA committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    750481c View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch 'party-component-sync-fix' into MapEventSync

    @garrettluskey
    garrettluskey committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    8a6076e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'party-component-sync-fix' into MapEventSync

    @garrettluskey
    garrettluskey committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    68966ff View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Merge branch 'party-component-sync-fix' into MapEventSync

    @garrettluskey
    garrettluskey committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    075462c View commit details
    Browse the repository at this point in the history

  2. Client was ticking

    @EgardA
    EgardA committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    984221e View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge branch 'development' into MapEventSync

    @EgardA
    EgardA committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    4d24806 View commit details
    Browse the repository at this point in the history

  2. Delete ClanDestroyPatch.cs

    @EgardA
    EgardA committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    3d0b419 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Update DisableBanditsCampaignBehavior.cs

    @EgardA
    EgardA committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    87b7a7e View commit details
    Browse the repository at this point in the history