 Théophyl Hoguet
|
54f747b186
|
Merge pull request #34 from THoguet/imgbot
[ImgBot] Optimize images
|
2023-12-13 01:27:07 +01:00 |
|
 nessar
|
b3195eb61b
|
fixed a bug in test
|
2023-12-13 01:25:42 +01:00 |
|
|
ImgBotApp
|
79ba5f1b19
|
[ImgBot] Optimize images
*Total -- 7,613.22kb -> 6,556.66kb (13.88%)
/rendu/mid_game.png -- 330.58kb -> 234.02kb (29.21%)
/rendu/startPage.png -- 1,702.94kb -> 1,347.14kb (20.89%)
/rendu/Game.png -- 2,673.50kb -> 2,299.33kb (14%)
/rendu/game_over.png -- 1,382.80kb -> 1,219.62kb (11.8%)
/app/src/main/resources/images/buildings/Empty.png -- 3.66kb -> 3.28kb (10.34%)
/app/src/main/resources/images/gameOver.png -- 1,349.71kb -> 1,287.33kb (4.62%)
/rendu/mid_game_2.png -- 170.03kb -> 165.95kb (2.4%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
|
2023-12-10 21:22:55 +00:00 |
|
|
nessar
|
54d441dc7c
|
rendu pdf
|
2023-12-10 21:30:10 +01:00 |
|
|
keahorvath
|
c381fc3590
|
Merge branch 'main' of https://github.com/THoguet/Projet-Approche-Objet
|
2023-12-10 21:06:16 +01:00 |
|
|
keahorvath
|
27247ac5e1
|
chaenges
|
2023-12-10 21:06:13 +01:00 |
|
|
Abdou
|
b05732768c
|
Project Report
|
2023-12-10 21:02:38 +01:00 |
|
|
keahorvath
|
f5a2c07029
|
solved pb of not showing all buildings
|
2023-12-10 18:55:26 +01:00 |
|
|
keahorvath
|
e67c893fe7
|
Merge branch 'main' of https://github.com/THoguet/Projet-Approche-Objet
|
2023-12-10 18:40:05 +01:00 |
|
|
keahorvath
|
fda2389e8d
|
added plus sign
|
2023-12-10 18:39:57 +01:00 |
|
|
nessar
|
48358d45b6
|
Merge branch 'main' of github.com:THoguet/Projet-Approche-Objet
|
2023-12-10 18:34:51 +01:00 |
|
|
nessar
|
73c6b00ef7
|
Add game over message and day survived label to GameOverView
|
2023-12-10 18:34:48 +01:00 |
|
|
keahorvath
|
fc6274b6c3
|
pb solved
|
2023-12-10 18:32:49 +01:00 |
|
|
keahorvath
|
0531ceb060
|
Merge branch 'main' of https://github.com/THoguet/Projet-Approche-Objet
|
2023-12-10 18:25:01 +01:00 |
|
|
keahorvath
|
1adf750143
|
save button(still bugged)
|
2023-12-10 18:23:41 +01:00 |
|
|
Théophyl Hoguet
|
9447a51cde
|
Merge pull request #33 from THoguet:THoguet/issue30
Game Over page
|
2023-12-10 18:18:31 +01:00 |
|
|
nessar
|
1bff750914
|
Game Over page
Fixes #30
|
2023-12-10 18:18:16 +01:00 |
|
|
nessar
|
400e89e59f
|
remove pause when opening contextmenu (bugged)
|
2023-12-10 17:27:09 +01:00 |
|
|
Théophyl Hoguet
|
8f072076bf
|
Merge pull request #32 from THoguet/THoguet/issue23
Add a score calculated based on buildings, ressoures and inhabitants / workers
|
2023-12-10 17:23:32 +01:00 |
|
|
Théophyl Hoguet
|
86e4ad71ab
|
Merge branch 'main' into THoguet/issue23
|
2023-12-10 17:23:01 +01:00 |
|
|
nessar
|
424afd0f35
|
Add a score calculated based on buildings, ressoures and inhabitants / workers
Fixes #23
|
2023-12-10 17:20:03 +01:00 |
|
|
keahorvath
|
5b6de7f771
|
Merge branch 'main' of https://github.com/THoguet/Projet-Approche-Objet
|
2023-12-10 17:19:35 +01:00 |
|
|
keahorvath
|
1a6e333baf
|
cleaner buttons
|
2023-12-10 17:19:32 +01:00 |
|
|
nessar
|
3f7393f186
|
remove todo
|
2023-12-10 17:07:33 +01:00 |
|
|
nessar
|
677ddac2ce
|
changed easy difficulty and tostring gamestarter
|
2023-12-10 17:06:48 +01:00 |
|
|
nessar
|
b094609893
|
Merge branch 'main' of github.com:THoguet/Projet-Approche-Objet
|
2023-12-10 16:58:43 +01:00 |
|
|
nessar
|
eeed5001db
|
add production consumption of ressources
|
2023-12-10 16:58:41 +01:00 |
|
|
keahorvath
|
25792d46d8
|
remove unused import
|
2023-12-10 16:43:42 +01:00 |
|
|
keahorvath
|
68c3d6e4a3
|
solve pb
|
2023-12-10 16:43:16 +01:00 |
|
|
keahorvath
|
88bdf2bceb
|
Merge branch 'main' of https://github.com/THoguet/Projet-Approche-Objet
|
2023-12-10 16:42:10 +01:00 |
|
|
keahorvath
|
d4561a946b
|
new buttons + load
|
2023-12-10 16:39:52 +01:00 |
|
|
Théophyl Hoguet
|
e378dc220c
|
Merge pull request #31 from THoguet/THoguet/issue7
inhabitants / workers behaviour
|
2023-12-10 15:55:05 +01:00 |
|
|
nessar
|
e329386951
|
Update resource production and building management
|
2023-12-10 15:53:32 +01:00 |
|
|
nessar
|
cd83888013
|
inhabitants / workers behaviour
Fixes #7
|
2023-12-10 15:44:29 +01:00 |
|
|
nessar
|
c0458c92eb
|
remove unused import
|
2023-12-10 15:08:14 +01:00 |
|
|
nessar
|
9983a3d8ec
|
remove useless file section when starting a game
|
2023-12-10 15:07:21 +01:00 |
|
|
keahorvath
|
8d97f4153c
|
fixed number of inhabitants issue
|
2023-12-10 14:33:48 +01:00 |
|
|
keahorvath
|
849a60c4ba
|
fixed size of stage(I think)
|
2023-12-10 14:21:58 +01:00 |
|
|
keahorvath
|
e25abd840f
|
fixed buttons
|
2023-12-10 14:08:01 +01:00 |
|
|
Abdou
|
acdf24fc18
|
Update README.md
|
2023-12-10 11:20:56 +01:00 |
|
|
Abdou
|
d86c0fab1f
|
Update README.md
|
2023-12-10 00:38:11 +01:00 |
|
|
Abdou
|
c06f915b7b
|
Update README.md
|
2023-12-10 00:30:19 +01:00 |
|
|
Théophyl Hoguet
|
96efaf8eaa
|
Merge pull request #29 from THoguet:THoguet/issue27
add confirmation popup when destroying a building / before doing any "hard" actions
|
2023-12-09 23:47:30 +01:00 |
|
|
nessar
|
151f892a0b
|
add confirmation popup when destroying a building / before doing any "hard" actions
Fixes #27
|
2023-12-09 23:47:04 +01:00 |
|
|
keahorvath
|
809516f57e
|
buttons (don't work)
|
2023-12-09 22:16:46 +01:00 |
|
|
keahorvath
|
9996dfb766
|
better tooltips
|
2023-12-09 12:15:12 +01:00 |
|
|
nessar
|
9e53a1b660
|
remove unused import
|
2023-12-09 03:14:18 +01:00 |
|
|
Théophyl Hoguet
|
0f82ee4a81
|
Merge pull request #26 from THoguet/THoguet/issue25
right click should show context menu with multiples options
|
2023-12-09 03:12:38 +01:00 |
|
|
nessar
|
67b231f257
|
right click should show context menu with multiples options
Fixes #25
|
2023-12-09 03:11:10 +01:00 |
|
|
Théophyl Hoguet
|
7ffa537606
|
Merge pull request #24 from THoguet/THoguet/issue2
Upgrade buildings
|
2023-12-09 00:36:38 +01:00 |
|