Commits · 63c3d679b3ead8f5c4367aca0d7fa78cd2ec2517 · Harry Wyatt / CM1101 Team Project · GitLab

Snippets Groups Projects

Oct 27, 2022
- Changing the start of the game. · 63c3d679
  Ahmed El Ghazali authored 2 years ago
  
  63c3d679
- More balancing · c417d36c
  Harry Wyatt authored 2 years ago
  
  c417d36c
- Changed some more balancing with enemies · c4fca989
  Harry Wyatt authored 2 years ago
  
  c4fca989
- Updated game info · 24db72d0
  Harry Wyatt authored 2 years ago
  
  24db72d0
- Made objective slightly clearer · 1d017242
  Harry Wyatt authored 2 years ago
  
  1d017242
- Made the end objective a bit clearer for the user · 97bfa95b
  Harry Wyatt authored 2 years ago
  
  97bfa95b
- Slightly changed how leveling up health works · 06f3863f
  Harry Wyatt authored 2 years ago
  
  06f3863f
- Merge branch 'main' of https://git.cardiff.ac.uk/c22033329/cm1101-team-project · 7e631ed2
  Harry Wyatt authored 2 years ago
  
  7e631ed2
- Cleaned up some imports in game.py · 5e5fb2bd
  Harry Wyatt authored 2 years ago
  
  5e5fb2bd
- Some changes regarding the start of the game. · 2099bae5
  Ahmed El Ghazali authored 2 years ago
  
  2099bae5
- Merge remote-tracking branch 'origin/main' · 4b28def4
  Matthew Aked authored 2 years ago
  
  4b28def4
- Final commit if everything works after pulling code and merging · aa73fc30
  Matthew Aked authored 2 years ago
  
  aa73fc30
- Added some new items · 41b8be53
  Harry Wyatt authored 2 years ago
  
  41b8be53
Oct 26, 2022
- Teneously fixed an issue causing an issue with dying · 2cd697d5
  Harry Wyatt authored 2 years ago
  
  2cd697d5
- Changed enemies to be a little easier · 5ba6e35b
  Harry Wyatt authored 2 years ago
  
  5ba6e35b
- Changed a stat on the minion · e4c78d27
  Harry Wyatt authored 2 years ago
  
  e4c78d27
- Fixed a minor bug with item names · 4ac78a01
  Harry Wyatt authored 2 years ago
  
  4ac78a01
- Merge remote-tracking branch 'origin/main' · c600577d
  Matthew Aked authored 2 years ago
```
# Conflicts:
#	game.py
```
  c600577d
- Boss battle added to game - gonna improve but this is working version · 9bb80556
  Matthew Aked authored 2 years ago
  
  9bb80556
- Fixed a bug with the stats command · 630ed700
  Harry Wyatt authored 2 years ago
  
  630ed700
- Added stats command · 4cd2462b
  Harry Wyatt authored 2 years ago
  
  4cd2462b
- Reverting a debug change I made · a3896d89
  Harry Wyatt authored 2 years ago
  
  a3896d89
- Included the concept of wobble in the battle info · d2489531
  Harry Wyatt authored 2 years ago
  
  d2489531
- Tenuously fixed some language usage · a6d4c098
  Harry Wyatt authored 2 years ago
  
  a6d4c098
- Increased the variety of names of keys and chests · c8fad9fb
  Harry Wyatt authored 2 years ago
  
  c8fad9fb
- Fixed some capitalisation errors · 37a7218f
  Harry Wyatt authored 2 years ago
  
  37a7218f
- Updated some language and remoed the probabilities from code · b9275c64
  Harry Wyatt authored 2 years ago
  
  b9275c64
- More changes for the game representation · 5467a8d9
  Ahmed El Ghazali authored 2 years ago
  
  5467a8d9
- Making the game look smooth, and well represented · 4e81270c
  Ahmed El Ghazali authored 2 years ago
  
  4e81270c
- Update README.md · 7bb79e6d
  Thomas Glasper authored 2 years ago
  
  7bb79e6d
- Merge branch 'item_id_test' into 'main' · c98ea705
  Thomas Glasper authored 2 years ago
```
Merge new item id system

See merge request !2
```
  c98ea705
- Merge branch 'main' into 'item_id_test' · 603cd7e6
  Thomas Glasper authored 2 years ago
```
# Conflicts:
#   item_dist.py
```
  603cd7e6
Oct 25, 2022
- Placed spawn probabilities in probabilities.json to show off file loading · 89473e43
  Harry Wyatt authored 2 years ago
  
  89473e43
- Removed old comment · 34b792a0
  Harry Wyatt authored 2 years ago
  
  34b792a0
- Minigame added to game boss battle function · 1f746d0d
  Matthew Aked authored 2 years ago
  
  1f746d0d
- Commit new item system for comment · da96c09e
  Harry Wyatt authored 2 years ago
  
  da96c09e
- Fix bug that player is not dying · c3d8e6df
  Thomas Glasper authored 2 years ago
  
  c3d8e6df
- Ensure keys and chests have unique IDs · 0e2b81d3
  Thomas Glasper authored 2 years ago
  
  0e2b81d3
- Fixed bugs in combat loop · b008b5b9
  Thomas Glasper authored 2 years ago
  
  b008b5b9
- Overhaul item spawning to ensure each item has unique ID · 595cb283
  Thomas Glasper authored 2 years ago
  
  595cb283