Merge main into box2d to implement physics

Implement phsyics from box2d branch

added In Progress label

assigned to @david.hermann

added 2 commits

• fa715493 - add .clang-tidy
• 92d88098 - Merge branch 'clang-tidy' into 'main'

Compare with previous version

added 2 commits

• c3cc85d1 - implemented loading level from provided commandline arg
• 8cdf2a72 - Merge branch 'level-from-commandline' into 'main'

Compare with previous version

added 7 commits

• dc33e795 - Function getUnitsInRangeWithDamagePotential now cares about Unit Faction
• 5e6393c3 - new context menu after movement + go back to fallback position if movement was cancelled
• ad8c46f8 - After Wait cmd unit change in UnavailableState
• 16f9795d - UNAVAILABLE Units now can't move
• 78e9e805 - updated Attack function
• e0ad6fe3 - Small Fix in Attack function
• 58267556 - Merge branch 'updated_unit_contextmenu' into 'main'

Compare with previous version

added 2 commits

• 71b25f18 - Help menu
• d1d187b3 - Merge branch 'helpMenu' into 'main'

Compare with previous version

added 5 commits

• 94659fe2 - add endscreen
• f01edb68 - add dynamic TileMarker color
• 7bca314e - Merge branch 'main' into 'win_end_screen'
• 63fa5a76 - Fix problems from merge
• 88f1189a - Merge branch 'win_end_screen' into 'main'

Compare with previous version

added 11 commits

• c10c0cc1 - 1 earlier commit
• 1ff39386 - Commit changes
• 71bdbd13 - Consider white buildings as not capturable
• a7dc2126 - Add building capture feature
• 7df32f81 - Change lvl.cpp
• aec0da45 - Solve crititcal bug with selecting state
• 7e878cdb - Make recruitment menu great again
• 818430d7 - Fix green and yellow textures being swapped
• fa34e64f - Merge remote-tracking branch 'origin/main' into buildingFeatures
• 1687c1cf - Fix showing tiles when not it should
• f3eaad31 - Merge branch 'buildingFeatures' into 'main'

Compare with previous version

added 2 commits

• e2b34e99 - Implement the end screen on capture of hq
• 81aa04cc - Merge branch 'Game-ending' into 'main'

Compare with previous version

added 2 commits

• 7a869852 - surround maps that are too small with water
• dbdf27fb - Merge branch 'water-surround' into 'main'

Compare with previous version

added 5 commits

• 24d94fbc - First Unit_info_menu
• cfab59a6 - Info now only shows if it is chosen in the context menu
• 3d65e85a - Changed look of info_menu
• a1d01845 - Merge branch 'main' into 'unit_info'
• 1f4c1d54 - Merge branch 'unit_info' into 'main'

Compare with previous version

added 1 commit

• 99221c2c - Add new test level

Compare with previous version

added 1 commit

• b75c9897 - Fix missing movement value for vertical bridges

Compare with previous version

added 3 commits

• a34e12d6 - remove mousclick handlers
• d90adea2 - Change color and width of the context menu
• c3814c85 - Disallow changing menu option while in info panel

Compare with previous version

added 96 commits

• c3814c85...f3352719 - 86 earlier commits
• 86bccb1d - check box on left
• c2355bd0 - noForest Bug Fix
• 7817180d - Merge branch 'leveleditor' of git-ce.rwth-aachen.de:david.maul/cpp-project into leveleditor
• 5bff094b - merge
• f41d5d21 - StreetsToWater Bug Fix
• 2f26c235 - Fix SegFault untenLinks
• f4af0eb0 - final fixes
• f16cae9b - Merge remote-tracking branch 'origin/main' into leveleditor
• 20b137f9 - Update spritesheet
• a9e168c9 - Merge branch 'leveleditor' into 'main'

Compare with previous version

added 3 commits

• 1e3fe845 - make unnecessary public members private and make some class names camel case
• 1abfb10f - prefix getter methods for positions with get
• 46525370 - Merge branch 'public-private-refactoring' into 'main'

Compare with previous version

Closing due to upcoming refactorings

closed