Commit Graph

131 Commits

Author SHA1 Message Date
15fe864d5a Merge pull request 'Adding idea and pref to .gitignore' (#12) from idea_to_gitignore into master
Reviewed-on: #12
2023-02-24 13:59:28 +01:00
cf83036c99 Merge branch 'master' into idea_to_gitignore 2023-02-24 13:59:12 +01:00
0cba7899ab
Adding idea and pref to .gitignore 2023-02-24 13:55:29 +01:00
93b3a946cb Merge pull request 'ProtoBrad' (#11) from ProtoBrad into master
Reviewed-on: #11
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-02-24 13:35:10 +01:00
ecbb784b0a Merge branch 'master' into ProtoBrad 2023-02-24 12:30:40 +01:00
30388303ba Mise à jour de 'JournalDeBord/src/rapports/200223.md' 2023-02-24 12:24:40 +01:00
424da00791 Adding meeting to the summary
This is the file for the menu on the right of the screen.

Signed-off-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-02-21 21:54:37 +01:00
46987915de Mise à jour de 'JournalDeBord/src/rapports/200223.md' 2023-02-21 21:00:09 +01:00
4a04faac06 Mise à jour de 'JournalDeBord/src/rapports/200223.md' 2023-02-21 20:53:01 +01:00
b01572f49e Ajouter 'JournalDeBord/src/rapports/200223' 2023-02-21 20:48:38 +01:00
55198d04e6 Merge pull request 'gradle_implementation' (#5) from gradle_implementation into master
Reviewed-on: #5
2023-02-20 15:24:28 +01:00
0df803c50a Merge branch 'master' into gradle_implementation 2023-02-20 15:22:01 +01:00
dfccb65f02 Merge pull request 'saving and loading map parser prototype' (#4) from prototype_saves into master
Reviewed-on: #4
Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-02-20 15:21:46 +01:00
40b6c8cfb4
Default gradle implementation + openjfx 2023-02-20 15:15:48 +01:00
0159ba196d Merge branch 'master' into prototype_saves 2023-02-20 12:39:14 +01:00
a74c78d8a9
finishing prototype 2023-02-20 12:37:04 +01:00
Mat
cc11b0d882 final version 2023-02-19 11:50:40 +01:00
Mat
3b6c21f4b4 add turn piece 2023-02-19 11:50:24 +01:00
Debucquoy
56ee3e943c
wip: menu 2023-02-17 17:02:34 +01:00
49904f8e17 Merge pull request 'Journal de bord pour ce lundi' (#3) from JDB into master
Reviewed-on: #3
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>
2023-02-14 18:31:28 +01:00
Debucquoy
c6d7e148df
save parser finished 2023-02-14 16:27:02 +01:00
Debucquoy
56cde5623e
WIP: prototype for saves 2023-02-14 15:21:43 +01:00
Mat
4608208b7f add choose level and correct spelling 2023-02-13 19:27:55 +01:00
90161800bc
fixup! Première entrevue 2023-02-13 18:55:12 +01:00
38feaa1a16
Première entrevue 2023-02-13 18:53:37 +01:00
Mat
29b73a31b3 mon prototype 2023-02-13 16:20:05 +01:00
1c34d22467 Merge pull request 'chapt2' (#1) from new_page into master
Reviewed-on: #1
2023-02-13 15:54:48 +01:00
7af26415f0 chapt2 2023-02-13 15:51:48 +01:00
Mat
9a867b8eb2 blop 2023-02-13 15:48:42 +01:00
3c7aa9ad8f
prototypes + jdb 2023-02-10 15:27:45 +01:00
a3fcbdee3c Initial commit 2023-02-09 17:08:22 +01:00