94 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mat	d5db1b14af	Merge branch 'master' of https://git.herisson.ovh/undefined_name/School_Project	2023-04-21 15:47:23 +02:00
Mat_02	ac368a6d19	Merge pull request 'rajout du prototype de menu pour le jeu' (#26) from interface-du-menu into master ... Reviewed-on: #26 Reviewed-by: BrokenBrad <eddyjiofak@gmail.com> Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-04-18 13:11:42 +02:00
Anthony Debucquoy	37cc19f49a	fixup! Fixing Branch	2023-04-06 18:25:04 +02:00
Anthony Debucquoy	a6fc46a0ea	Fixing Branch	2023-04-06 18:15:33 +02:00
BrokenBrad	78e50549d0	Mise à jour de 'app/src/main/java/school_project/Controller.java'	2023-04-04 15:20:40 +02:00
Mat	00f62097f1	fix the issue about the position of the footer	2023-04-02 23:37:35 +02:00
BrokenBrad	d4f254139c	Mise à jour de 'app/src/main/java/school_project/Controller.java'	2023-03-31 00:20:47 +02:00
BrokenBrad	fbbda476b4	Mise à jour de 'app/src/main/java/school_project/Controller.java'	2023-03-30 23:59:21 +02:00
BrokenBrad	70fef807d5	Supprimer 'app/src/main/java/school_project/Controller.java'	2023-03-30 23:58:42 +02:00
BrokenBrad	90f25b1c26	Ajouter 'app/src/main/java/school_project/Piece.java'	2023-03-30 23:58:06 +02:00
Eddy	5bfb2aba9b	progress	2023-03-30 11:51:47 +02:00
Eddy	a99a53868b	progress	2023-03-30 11:47:23 +02:00
Mat	592b179a19	rajout du prototype de menu pour le jeu	2023-03-28 13:23:36 +02:00
Debucquoy Anthony	eeae13b339	Merge pull request 'Shape_Piece_Map' (#15) from Shape_Piece_Map into master ... Reviewed-on: #15 Reviewed-by: BrokenBrad <eddyjiofak@gmail.com> Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-03-28 00:31:41 +02:00
Mat_02	b41714c27f	Merge pull request 'Story' (#24) from Story into master ... Reviewed-on: #24 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com> Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>	2023-03-27 19:39:08 +02:00
Eddy	bb5e2ff401	new progress , succeded in moving the node with the mouse still not ... finished tho	2023-03-27 01:19:34 +02:00
Eddy	895b20b680	new progress , succeded in moving the node with the mouse still not ... finished tho	2023-03-27 01:14:05 +02:00
Mat	7527309d79	Correction des fautes, hésité pas si il en reste	2023-03-26 20:12:08 +02:00
Eddy	5911d88918	progress with the rotation system but still not finished , it works tho	2023-03-25 18:22:47 +01:00
Eddy	49d2c5d7ab	WIP:piece graphics	2023-03-23 14:54:45 +01:00
Debucquoy Anthony	0a72e6e047	Merge branch 'master' into Story	2023-03-23 14:46:20 +01:00
Mat	3b6234f4a1	Rajout du meeting du 23 mars	2023-03-23 12:02:41 +01:00
Mat	dd01bc96cb	rajout de la syntaxe (titre)+modification day3	2023-03-23 11:32:19 +01:00
Debucquoy	e7d82b3076	Setting default position of vector to 0.	2023-03-23 11:24:34 +01:00
Debucquoy Anthony	bc2feee03c	Merge branch 'master' into Shape_Piece_Map	2023-03-21 23:07:32 +01:00
Anthony Debucquoy	e4478c878c	trying to fix drone again	2023-03-21 23:05:39 +01:00
Debucquoy Anthony	1ef428962f	Merge branch 'master' into Shape_Piece_Map	2023-03-21 21:28:23 +01:00
Debucquoy	c585c54da2	fixing drone	2023-03-21 14:54:48 +01:00
Debucquoy Anthony	df457b830a	Merge branch 'master' into Shape_Piece_Map	2023-03-21 14:30:53 +01:00
Debucquoy	bd41d24a36	Merge branch 'master' into Shape_Piece_Map	2023-03-21 14:21:13 +01:00
Debucquoy	24df4e376c	Adding Pieces positions	2023-03-21 14:14:39 +01:00
Anthony Debucquoy	4854fef677	wip ... Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>	2023-03-21 09:56:13 +01:00
Anthony Debucquoy	71beb69c84	Changing addShape to AddPiece ... Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>	2023-03-20 23:57:10 +01:00
Debucquoy Anthony	1740ad2e13	Merge pull request 'deplacement du fichier texte de l'histoire' (#21) from Story into master ... Reviewed-on: #21 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-03-17 15:07:48 +01:00
Mat	04fd342a57	deplacement du fichier texte de l'histoire	2023-03-17 15:03:16 +01:00
Debucquoy Anthony	dfc6056767	Merge pull request 'story' (#20) from undefined_name/School_Project#8 into master ... Reviewed-on: #20	2023-03-17 14:53:46 +01:00
Debucquoy Anthony	1837d976aa	Merge branch 'master' into undefined_name/School_Project#8	2023-03-17 13:40:48 +01:00
Mat	f5bd36f4e0	premier test	2023-03-16 11:01:10 +01:00
Mat	716e874b7e	test add storie	2023-03-10 11:08:00 +01:00
Debucquoy	3ab6ff1bfa	Merge branch 'master' of git.herisson.ovh:undefined_name/School_project	2023-03-04 18:59:04 +01:00
Debucquoy	f08ed98897	signing	2023-03-04 18:58:14 +01:00
Debucquoy Anthony	aafb5f5c66	Update 'README.md'	2023-03-04 16:15:42 +01:00
Debucquoy	bbfc5687d9	fix ci	2023-03-04 15:36:11 +01:00
Debucquoy	922497573b	fixup! fixup! fixup! fixup! fixup! maybe finishing ci? hopefully	2023-03-04 15:14:38 +01:00
Debucquoy	e55b17fcd8	fixup! fixup! fixup! fixup! maybe finishing ci? hopefully	2023-03-04 15:13:21 +01:00
Debucquoy	08c4a08a01	fixup! fixup! fixup! maybe finishing ci? hopefully	2023-03-04 15:12:15 +01:00
Debucquoy	207195c0c8	fixup! fixup! maybe finishing ci? hopefully	2023-03-04 15:05:17 +01:00
Debucquoy	ec7692f8d3	fixup! maybe finishing ci? hopefully	2023-03-04 14:59:37 +01:00
Debucquoy	5c4dc5c370	maybe finishing ci? hopefully	2023-03-04 14:53:38 +01:00
Debucquoy	bc05260ba7	adding missing wraper	2023-03-04 14:21:14 +01:00