Merge Version 29.3 #1084
Merged
Merge Version 29.3 #1084
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
* sides as a dynamic array (cherry picked from commit 1eb9e5e9bdb2fa52855ac8758423ab8852ef0c07) * Meldung über Heiltrank ging an die falsche Einheit (#1073) https://bugs.eressea.de/view.php?id=3024 * make battle.sides a dynamic array second attempt at doing this, looking better
still need a test for rules.wage.function
Soll alle Eisenwaffen der Einheit zersetzen.
avoid unused variable warning add missing includes
monsters should not be heroes, in a group, or have fixed stealth
Vermonsterung reparieen und testen
* join_battle was weird? * refactor harbourmaster checks and fix bug 3031: ships landing in a region with working harbour get their coast reset. * compiler wants me to declare the building struct
* test side index, enemies, and relations # Conflicts: # src/battle.test.c * eliminate the enemies array * replace the static per-side relations array with a hashmap * unused variable & code in test * stdint and stdbool require C99 * eliminate MAXSIDES from get_row * simple test for get_unitorw (deserves more testing) * use dynamic strings in lieu of yet another big fixed buffer. * MAXSIDES is gone
added a test for seeing guarding units.
* replace weeks with day, WIP * replace skill.weeks with days (WIP) skill merge still failing tests explain tricky math function. * some more fixes to merge tests and algorithm slowly getting there. * additional testing fix skill merge calculation * signedness and iwyu
people send in their CR, and it contains "PARTEI 7" lines.
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.
No description provided.