Resolve "Adjust cannon angle from touch input" (!51) · Merge requests · Snorre Skjellestad Kristiansen / TDT4240 Tank Wars · GitLab

Snippets Groups Projects

Merged Eli Fjellbirkeland Johannesen requested to merge 34-touch-cannon-angle into main 2 years ago

Apr 14, 2023
- Fix bugs related to other new commits · e91f06dd
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  e91f06dd
- Merge branch 'main' into '34-touch-cannon-angle' · bdf7e148
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  # Conflicts: # frontend/core/src/com/game/tankwars/model/Tank.java
  bdf7e148
Apr 13, 2023
- Merge branch 'main' into '34-touch-cannon-angle' · fa2a2723
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  # Conflicts: # frontend/core/src/com/game/tankwars/TankWarsGame.java # frontend/core/src/com/game/tankwars/controller/GameController.java # frontend/core/src/com/game/tankwars/model/Tank.java # frontend/core/src/com/game/tankwars/view/GameHud.java # frontend/core/src/com/game/tankwars/view/GameScreen.java
  fa2a2723
- shot bullet at correct angle · e5e2a895
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  e5e2a895
- Add buttons for aiming · 158e1ef5
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  158e1ef5
- Cannon does not aim when touching buttons · e6b1e949
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  e6b1e949
Apr 12, 2023
- Bullet shoots with the input power · 5820f8fa
  Eli Fjellbirkeland Johannesen authored 2 years ago
  
  5820f8fa
Apr 05, 2023
- (#34 ): methods for rotating cannon in tank · e5f96fee
  Magnus Segtnan Skjølberg authored 2 years ago
  
  e5f96fee
Apr 04, 2023
- (#18 ): remove hud debug · ec06f67e
  Magnus Segtnan Skjølberg authored 2 years ago
  
  ec06f67e
Apr 03, 2023
- (#18 ): potential wall collision fix · 1f1f4642
  Magnus Segtnan Skjølberg authored 2 years ago
  
  1f1f4642
- (#18 ): move hud instantiate before controller · 3a6324ec
  Magnus Segtnan Skjølberg authored 2 years ago
  
  3a6324ec
- (#18 ): merge combine-hud-game into main, fix conflicts · 42436140
  Magnus Segtnan Skjølberg authored 2 years ago
  
  42436140
- (#18 ): use ResourceManager for loading gameplay skin · ff419781
  Magnus Segtnan Skjølberg authored 2 years ago
  
  ff419781
- (#18 ): gameplay skin more modifiable + changed to bitmapfont · 8432b1c1
  Magnus Segtnan Skjølberg authored 2 years ago
  
  8432b1c1
Apr 01, 2023
- (#18 ): setter to change visible health · f9fac2c9
  Magnus Segtnan Skjølberg authored 2 years ago
  
  f9fac2c9
- (#18 ): correct healthbar pos, rotation and value · 4cb5b404
  Magnus Segtnan Skjølberg authored 2 years ago
  
  4cb5b404
- (#18 ): changes healthbar and slider · feec88f8
  Magnus Segtnan Skjølberg authored 2 years ago
  
  feec88f8
Mar 30, 2023
- (#18 ): add visible knob to slider · 733fcccf
  Magnus Segtnan Skjølberg authored 2 years ago
  
  733fcccf
- (#18 ): heighten terrain to make space for hud · b6b74528
  Magnus Segtnan Skjølberg authored 2 years ago
  
  b6b74528
- (#18 ): add pixels to viewport + scaling to meters · 1c782ce6
  Magnus Segtnan Skjølberg authored 2 years ago
  
  1c782ce6
- (#18 ): remove setinputprocessor to null · 41f0393b
  Magnus Segtnan Skjølberg authored 2 years ago
  
  41f0393b
- (#18 ): add camera for hud and world + scaling of camera · 6a38f776
  Magnus Segtnan Skjølberg authored 2 years ago
  
  6a38f776
- (#18 ): add viewport to gamehud · e1ef339e
  Magnus Segtnan Skjølberg authored 2 years ago
  
  e1ef339e
- (#18 ): connect hud input to tank shoot and movement · 4702bff7
  Magnus Segtnan Skjølberg authored 2 years ago
  
  4702bff7
Mar 29, 2023
- (#18 ): merge game hud into main · fd8cfb8f
  Magnus Segtnan Skjølberg authored 2 years ago
  
  fd8cfb8f
Mar 22, 2023
- (#18 ): add power as field in Tank class · 2f59a07d
  Magnus Segtnan Skjølberg authored 2 years ago
  
  2f59a07d
- (#18 ): add simple screen class for gameplay · 03df8ca9
  Magnus Segtnan Skjølberg authored 2 years ago
  
  03df8ca9
- (#18 ): add interaction with hud to gameplay controller · 794c5294
  Magnus Segtnan Skjølberg authored 2 years ago
  
  794c5294
- (#18 ): add freetype library to gradle.build · bf8276a6
  Magnus Segtnan Skjølberg authored 2 years ago
  
  bf8276a6
- (#18 ): create hud for gameplay class · 27ecfd44
  Magnus Segtnan Skjølberg authored 2 years ago
  
  27ecfd44
- (#18 ): add gameplay-skin made in skincomposer · 29777a26
  Magnus Segtnan Skjølberg authored 2 years ago
  
  29777a26