Commit graph

367 commits

Author SHA1 Message Date
Tipragot ed917e3044 Add mouse controls 2023-11-05 18:36:28 +01:00
Raphaël 647239b155 Modification image de loading 2023-11-05 17:43:18 +01:00
Tipragot 8042a33207 Merge branch 'main' into boss-fight 2023-11-05 17:42:25 +01:00
Raphaël f0ddf38d7e
Merge pull request 'On retire les dialogues' (#64) from remove-dialogs into main
Reviewed-on: #64
2023-11-05 16:42:04 +00:00
Tipragot c74267e7b3 On retire les dialogues 2023-11-05 17:40:58 +01:00
Tipragot 3e28ad8698 Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 17:31:31 +01:00
Tipragot c3e3c520e2 DADADADA 2023-11-05 17:31:28 +01:00
Raphaël 1f6a3fc751 Fix projectiles appariton hors fightBox 2023-11-05 17:28:57 +01:00
Tipragot e902cc4cab Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 17:21:15 +01:00
Tipragot 8d9e7736f9 DADA 2023-11-05 17:21:09 +01:00
Tipragot 2fd493034a Fix horizontal 2023-11-05 17:19:53 +01:00
Raphaël 8016f90cc4 Fix Background 2023-11-05 17:16:53 +01:00
Tipragot c416243695 Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 17:13:44 +01:00
Tipragot 0d0ee0dbc1 Marche pas 2023-11-05 17:13:08 +01:00
Raphaël 22e3ea071a Deplacememt de la barre de vie 2023-11-05 17:11:12 +01:00
Raphaël 57fbee1271 Fix Background 2023-11-05 17:01:07 +01:00
Raphaël 0383894bc0 Nouveau background 2023-11-05 16:54:41 +01:00
Tipragot c4649ae52a
Merge pull request 'Fix nombre depassant les bornes' (#63) from Fix-tricheur into main
Reviewed-on: #63
2023-11-05 15:12:14 +00:00
Raphaël af2abb308e Fix nombre depassant les bornes 2023-11-05 16:03:49 +01:00
CoCo_Sol 4b2b6ea89c fix apparition de projectiles de zone 2023-11-05 14:49:29 +01:00
Raphaël 82405e7eeb
Merge pull request 'Dialogues (fais pas chier j'ai trop mal a la tête pour faire une bonne PR)' (#62) from dialogues into main
Reviewed-on: #62
2023-11-05 12:02:47 +00:00
Tipragot 3374d3dd51 Ajout de l'order 2023-11-05 09:01:53 +01:00
Tipragot acaf9475a5 Fix delta 2023-11-05 09:00:54 +01:00
Tipragot f49eff21df Fix dialogs 2023-11-05 08:52:03 +01:00
Tipragot e9455a8f56 Ajout des dialogues 2023-11-05 08:40:45 +01:00
Tipragot b7e44b4192 Fix Warnings 2023-11-05 08:07:28 +01:00
Raphaël 6d1abb44a1 WIP Ajout projectil horizonto et du system de vagu 2023-11-05 02:39:37 +01:00
CoCo_Sol eae3f5392b fix erreur time dans la fonction spike 2023-11-05 00:25:05 +01:00
CoCo_Sol 889dd62bdf Merge remote-tracking branch 'origin/wave' into boss-fight 2023-11-05 00:24:06 +01:00
Raphaël 1c5254fb8a WIP Ajout systeme de vague 2023-11-05 00:20:19 +01:00
CoCo_Sol 918142545d warning zone pour les spike 2023-11-05 00:19:15 +01:00
CoCo_Sol 3dcc91a2df ajout de la barre de vie 2023-11-04 23:23:55 +01:00
CoCo_Sol 7e0898d848 ajout de l'annimation quand on prend des degats 2023-11-04 22:57:44 +01:00
CoCo_Sol 1522fd9f79 fix erreur spike respawn 2023-11-04 22:48:05 +01:00
CoCo_Sol 69d820bde4 fix destruction des projectile de plui 2023-11-04 22:37:01 +01:00
Raphaël fb73c49fd6 Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-04 22:26:28 +01:00
Raphaël 01a233e3e2 Animation d'arrivé des prjectiles 2023-11-04 22:26:24 +01:00
CoCo_Sol 5eae215243 import bar de vie 2023-11-04 22:25:41 +01:00
CoCo_Sol 61d96be632 fix erreur de supression des projectile type plui 2023-11-04 21:20:22 +01:00
Raphaël bd7176e791 Ajout rainning projectiles 2023-11-04 21:06:58 +01:00
CoCo_Sol 1e26bc2851 fix erreur 2/2 2023-11-04 19:46:22 +01:00
CoCo_Sol 28037ae0ba fix bug de la vie negative 2023-11-04 19:44:55 +01:00
CoCo_Sol 06cc7bbca3
Merge pull request 'Fix supression ...' (#61) from typing into main
Reviewed-on: #61
2023-11-04 18:36:29 +00:00
Raphaël e5cc379bbf Ajout des spike sur le coté 2023-11-04 19:33:13 +01:00
CoCo_Sol 4aa04ce8f2 ajout des spike WIP 2023-11-04 19:09:50 +01:00
CoCo_Sol 5f350bbc0f fix vitesse import animation 2023-11-04 17:39:35 +01:00
Tipragot cb14acf58e On règle les problèmes et c'est bon 2023-11-04 16:47:31 +01:00
Tipragot 28b78774d2 Fix supression ... 2023-11-04 16:41:20 +01:00
CoCo_Sol 67abb5dd07
Merge pull request 'Ajout du boutton rejouer dans directory_search' (#59) from play-again into main
Reviewed-on: #59
2023-11-04 14:42:11 +00:00
Raphaël cdacf75e96 Fix taille des assets dans le boss fight 2023-11-04 15:30:55 +01:00