Merge units into main (!15) · Merge requests · David Maul / cpp-project

Jan 31, 2025
- Merge branch 'main' into 'units' · 9834ecf8
  Frederik Alexander Keens authored 6 months ago
  
  # Conflicts: # src/level.cpp # src/level.hpp # src/tile.cpp # src/unit.cpp # src/unit.hpp
  9834ecf8
- Fix problems from units branch merge conflicts · 5400f688
  Frederik authored 6 months ago
  
  5400f688
Jan 30, 2025
- Adjusted and refactored the function calc_state · 07726a73
  Lorenz Martin Diel authored 6 months ago
  
  07726a73
- Fix unit hpp · 6692c6dd
  Max Cherris authored 6 months ago
  
  6692c6dd
- Cut some function parts from calc_state · e1c9cb11
  Max Cherris authored 6 months ago
  
  e1c9cb11
- Removed unnecessary function · 7fb409a0
  Max Cherris authored 6 months ago
  
  7fb409a0
- Merge Lorenz unit-branch into Max unit-Branch · 21bba2b3
  Max Cherris authored 6 months ago
  
  It works now
  21bba2b3
- fix bug concerning moving and attacking · cce05ded
  Max Cherris authored 6 months ago
  
  cce05ded
- Add responsive Unitstates for movement · 645c9bc0
  Max Cherris authored 6 months ago
  
  645c9bc0
- adjusted attack function on DamageTable in weapon · 97a2125b
  Lorenz Martin Diel authored 6 months ago
  
  97a2125b
- Fixed Bug: units no longer dissappear when they are being placed · 5b0d77b7
  Lorenz Martin Diel authored 6 months ago
  
  5b0d77b7
- Save work for soon · 19e1fdec
  Max Cherris authored 6 months ago
  
  19e1fdec
- Refactor left_click · 3528a3d6
  Max Cherris authored 6 months ago
  
  Why does the clicked unit dissappear after moving it?
  3528a3d6
- Fix bug in selecting units · af6c8e06
  Max Cherris authored 6 months ago
  
  New problems: - illegal instruction error - units disappear after moving them
  af6c8e06
Jan 29, 2025
- Make progress towards porting new attack function · 91cd1cb4
  Max Cherris authored 6 months ago
  
  Currently the matchupTable needs to be loaded for both primary and secondary weapontypes How do we do that?
  91cd1cb4
- Refactor simple issues · 5feb27d1
  Max Cherris authored 6 months ago
  
  Such as typos, unused includes and unnecessary comments
  5feb27d1
Jan 28, 2025
- Implement removal of units on stage if defeated · 1c234b83
  Max Cherris authored 6 months ago
  
  1c234b83
- Add actual fighting · abb13726
  Max Cherris authored 6 months ago
  
  abb13726
- Add building selection · 70b3c323
  Max Cherris authored 6 months ago
  
  70b3c323
- Add actual fighting mechanics · 4b69d0a8
  Max Cherris authored 6 months ago
  
  Modifie Level.hpp with eventhandling (bare-bones) Fix potential bugs in unit.cpp
  4b69d0a8
- Fix all possible bugs · c3aeb3d7
  Max Cherris authored 6 months ago
  
  Had to switch from references to pointers for now; should be refactored in the future
  c3aeb3d7
- Update with move position and format unit.cpp · 159e0b5f
  Max Cherris authored 6 months ago
  
  159e0b5f
- Update der Unit.cpp · 85ba7225
  Max Cherris authored 6 months ago
  
  85ba7225
- Add onClick for units and basic attack initialization · ab45c86e
  Max Cherris authored 6 months ago
  
  ab45c86e
Jan 27, 2025
- Add description in unit.hpp · 7c937293
  Max Cherris authored 6 months ago
  
  7c937293
- Start work on reading the XML-File for the units · 38a8e6ea
  Max Cherris authored 6 months ago
  
  38a8e6ea
- Add function to check for Range from allied to enemy unit(s) · 952853aa
  Max Cherris authored 6 months ago
  
  952853aa
- Add comments to signal future progress · 2d37a5c8
  Max Cherris authored 6 months ago
  
  2d37a5c8
- add first rendition of combat system · 393dc733
  Max Cherris authored 6 months ago
  
  393dc733
- Add nested unordered_map for damageMatrix · de1bea63
  Max Cherris authored 6 months ago
  
  de1bea63
- Update unit.hpp with required methods · 21ca6c12
  Max Cherris authored 6 months ago
  
  21ca6c12
- experimental changes for units and weapons · b8b5e5d9
  David Maul authored 6 months ago
  
  b8b5e5d9

Merge units into main

Merge request reports

Activity