Skip to content

Navigation Menu

Appearance settings

View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
View all resources
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  Accelerator
  GitHub Stars
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

Return-To-The-Roots / s25client Public

Notifications You must be signed in to change notification settings
Fork 93
Star 566

Code
Issues 264
Pull requests 15
Actions
Projects
Wiki
Security and quality
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Wiki
Security and quality
Insights

Add leather addon#1720

Merged

Flamefire merged 101 commits intoReturn-To-The-Roots:masterReturn-To-The-Roots/s25client:masterfrom

ottml:leather_addonottml/s25client:leather_addonCopy head branch name to clipboard

Feb 21, 2026

Conversation Commits101 (101)Checks Files changed

Merged

Add leather addon#1720
Flamefire merged 101 commits intoReturn-To-The-Roots:masterfrom
ottml:leather_addon

Commits

Commits on Feb 20, 2026

Adding ware workflow, buildings and menus for leather addon
ottml
committed
Add distribution tab for ham and make gui more general
ottml
committed
Add compatibilty code
ottml
committed
Add direct transport route
ottml
committed
Add fixed animations from leather_bobs.lst
ottml
committed
Skinner goes out to get skins from carcass if he has no pigs (naturally died our died by the hunter)
ottml
committed
LeatherAddon military (1): Add SetArmorAllowed game command
ottml
committed
LeatherAddon military (2): Add logic for armor in military building as for coins
ottml
committed
LeatherAddon military (3): Add armor gui elements to military building
ottml
committed
Add test for SetArmorAllowed
ottml
committed
Add compatibility code for ChangeDistribution and increase game command version to 2
ottml
committed
Add new transportation type leatherworking and compatibility code for save game and replays
ottml
committed
Fix wrong default build order
ottml
committed
Solider has 30 percent chance to not die if he has an armor and is hit by a catapult (losing his armor)
ottml
committed
Reduce search range for skinner to hunter distance
ottml
committed
Do not show tabs for goods in distribution gui having only one entry
ottml
committed
Add correct default values
ottml
committed
Fix build after rebase
ottml
committed
Add new base class for armored people
ottml
committed
Use same render code for fighting and armored people
ottml
committed
Add armor base class to trade donkey too
ottml
committed
Add armored soldiers to inventory and add enums for it
ottml
committed
Add logic for counting armored soldiers in inventory and compatibility code
ottml
committed
Add and remove armored soldiers to global inventory add missing adds to warehouse inventory
ottml
committed
Add tooltip to inventory to show number of armored soldiers
ottml
committed
Show amored soldiers on ship (debug only)
ottml
committed
Avoid crash in sorted container
ottml
committed
Adjust comperators to take armor into account
ottml
committed
Avoid crash/inconsisent state due to new comperator including armor
ottml
committed
Fix formatting
ottml
committed
Handle real inventory correct (Part 1)
ottml
committed
Fix formatting and constexpr
ottml
committed
Handle real inventory correct (Part 1)
ottml
committed
Add armored soldiers to reserve
ottml
committed
Add real for orderJob
ottml
committed
Use correct lst file (seems to be broken due to fixup from git)
ottml
committed
Handle armor correct when building is destroyed or captured and when soldiers are upgraded by coins
ottml
committed
Add and remove armored figures correct to visual inventory
ottml
committed
Remove code duplication and draw +1 only if HITPOINTS addon is activated. Show armor icon above soldier if he has armor but not for soliders in the inventory of the ship
ottml
committed
Add addons to disable armor by default and behaviour for armor delivery after capturing
ottml
committed
Add function to avoid code duplication
ottml
committed
Fix clang-tidy warnings
ottml
committed
Add test for trading and warehouse
ottml
committed
Add test for soldier losing armor in fight instead of hitpoint
ottml
committed
Add replay compatibility for ChangeBuildOrder and SetAllInventorySettings game commands
ottml
committed
Add comment about GC changes
ottml
committed
Fix circular dependency during deserialization
ottml
committed
Increase minor replay version to be able to set the correct initial distributions for old replays without leather addon
ottml
committed
Code review
ottml
committed
Code review: Improve unit test
ottml
committed
Code review: Move addon check functions for unused Ware/Jobs/Buildings to separate header to a void duplication
ottml
committed
Code review: Inline functions
ottml
committed
Code review: Use CamelCase and rename enum class
ottml
committed
Code review: Rename IsArmorDisabled to IsArmorAllowed
ottml
committed
Code review: Use consistent cast and parse argument as reference. Remove not used code where goal is nullptr because this can never happen
ottml
committed
Code review: Remove Invalid state from enum and throw exception when wrong good type for leather addon
ottml
committed
Code review: Rename functions, remove auto return type and capture addons checks as bool const, use Gamesettings as parameter instead of player
ottml
committed
Code review: Add named constants for deserialization code for better readibility
ottml
committed
Code review: Use checkedCast
ottml
committed
Code review: Rewrite test and fold 4 cases into one
ottml
committed
Code review: Use switch

ottml
and
Flamefire
committed
Code review: Rename variables and change type
ottml
committed
Code review: Use constants and rewrite counting of traded soldiers
ottml
committed
Code review

ottml
and
Flamefire
committed
Code review: Use clearer names for varibles
ottml
committed
Code review: Optimize code
ottml
committed
Code review: Use better function names and remove german comment
ottml
committed
Code review: Check for production disabled and use radius instead of square for skinner
ottml
committed
Code review: Use extra enum for armor icon above soldier
ottml
committed
Code review: Use better function names and remove german comment
ottml
committed
Code review use operator instead of member
ottml
committed
Code review: Add comment to explain scenario
ottml
committed
Code review: Handle GoodType::Nothing in save games
ottml
committed
Code review: Add comment to clarify no OBB write appears
ottml
committed
Code review: Fix wrong index
ottml
committed
Code review: Split a PeopleArray from GoodsAndPeopleArray and let the latter inherit the former
ottml
committed
Code review: Revert changed parameter name
ottml
committed
Code review: Cleanup header and remove using instead of direct type
ottml
committed
Code review: Hunter and skinner have same behaviour. Time for hunter and skinner in case of active leather addon to finish their work is doubled to give the skinner the chance to reach the dead ani…
ottml
committed
Code review: Add check to avoid assert
ottml
committed
Code review: Add comment about ownership of animal for skinner and hunter
ottml
committed
Code review: Apply patch to remove nofArmored base class not needed anymore. Add amor to the noFigure base class
ottml
committed
Code review add comment

ottml
and
Flamefire
committed
Fix after rebase
ottml
committed
Code review: Fix formatting
ottml
committed
Code review:
ottml
committed
Code review: Use access functions instead of direct member access
ottml
committed
Code review: Revert asserts for Add/Remove armored soldier
ottml
committed
Code review: Change info text
ottml
committed
Code review: Inline function
ottml
committed
Code review: Use access functions instead of direct member access
ottml
committed
Code review: Remove write operator[] for armoredSoldier and use direct variable at rare places needed
ottml
committed
Code review: Use container for Serialize/Deserialize
ottml
committed
Fix crash
ottml
committed
Code review: style issues and nitpicks
ottml
committed
Update libs/s25main/buildings/nobMilitary.cpp

ottml
and
Flamefire
committed
Code review: Add path optimization. See #1785
ottml
committed

Commits on Feb 21, 2026

Unify `FindClientForCoin` with `FindClientForArmor`
Flamefire
committed
Sort possible clients of coins/armor by estimated priority
Flamefire
committed
Revert "Sort possible clients of coins/armor by estimated priority"
Flamefire
committed
Merge branch 'master' into leather_addon
Flamefire
authored

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.