Merge branch 'main' into 'Emir' (de7b0396) · Commits · DUCHMANN LEO / Climate Simulator Global Organization · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Climate Simulator Global Organization
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

DUCHMANN LEO
Climate Simulator Global Organization
Commits
de7b0396

Commit de7b0396 authored 2 years ago by

SINANOVIC EMIR

Downloads
- Plain Diff

Merge branch 'main' into 'Emir'

# Conflicts:
#   src/Champs.py
#   src/Game.py

parents fb505570 e77a9110

Branches

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

Linux-Mac/README.md 17 additions, 0 deletions

Linux-Mac/README.md
Linux-Mac/requirements.txt 1 addition, 0 deletions

Linux-Mac/requirements.txt
README.md 73 additions, 59 deletions

README.md
WIKI.md 23 additions, 0 deletions

WIKI.md
assets/Interface/button.png 0 additions, 0 deletions

assets/Interface/button.png
assets/Interface/money.png 0 additions, 0 deletions

assets/Interface/money.png
assets/Interface/terre.png 0 additions, 0 deletions

assets/Interface/terre.png
assets/Plantation/champ.png 0 additions, 0 deletions

assets/Plantation/champ.png
assets/Temps/nice_weather.png 0 additions, 0 deletions

assets/Temps/nice_weather.png
img/ecran_de_départ.png 0 additions, 0 deletions

img/ecran_de_départ.png
img/ecran_de_jeu.png 0 additions, 0 deletions

img/ecran_de_jeu.png
img/plante_infecte.png 0 additions, 0 deletions

img/plante_infecte.png
img/plante_morte.png 0 additions, 0 deletions

img/plante_morte.png
src/Infrastructure.py 14 additions, 14 deletions

src/Infrastructure.py
src/T3.py 51 additions, 51 deletions

src/T3.py
src/Temps.py 189 additions, 190 deletions

src/Temps.py

with 368 additions and 314 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment