Compare commits

...

61 commits

Author SHA1 Message Date
Tipragot 833330f75d Remove useless file 2023-11-05 22:28:18 +01:00
Tipragot 92611db3a1 Remove saved assets 2023-11-05 22:27:42 +01:00
Tipragot 88b2ec0280 Remove last print 2023-11-05 22:26:58 +01:00
Tipragot 6a67d6aeab Ajout des spikes 2023-11-05 22:19:32 +01:00
Tipragot 386a0ec85e Finalisation du jeui 2023-11-05 22:16:23 +01:00
Tipragot f80a7a9cd1 Texte de fin 2023-11-05 21:40:48 +01:00
Tipragot 86b8d02777 Ajout son 2023-11-05 21:23:47 +01:00
Tipragot 7149019109 Ajout de sons 2023-11-05 21:20:02 +01:00
Raphaël 5d9cbdc1b6 Commit final 2023-11-05 20:32:35 +01:00
Tipragot 74ce12a352 Bye les jeuns 2023-11-05 19:16:59 +01:00
Raphaël 341aa987da Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 19:11:04 +01:00
Raphaël 9915b42e8d Ajout animation bg mort 2023-11-05 19:11:01 +01:00
Tipragot fc09999a37 Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 19:05:39 +01:00
Tipragot 024be68ae8 Fix end 2023-11-05 19:05:36 +01:00
Raphaël f4f3ca8489 Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 19:04:32 +01:00
Raphaël 52b8458547 Fix Animation mort 2023-11-05 19:04:29 +01:00
Tipragot 2c7bcc41cc Ajout de la mort :( 2023-11-05 18:52:56 +01:00
Tipragot ff5f8c9edd Merge branch 'boss-fight' of https://git.tipragot.fr/raphael/gtn into boss-fight 2023-11-05 18:36:30 +01:00
Tipragot ed917e3044 Add mouse controls 2023-11-05 18:36:28 +01:00
Raphaël b2ca351bc5 Ajout animation de mort 2023-11-05 18:33:06 +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
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
CoCo_Sol 4b2b6ea89c fix apparition de projectiles de zone 2023-11-05 14:49:29 +01:00
Tipragot acaf9475a5 Fix delta 2023-11-05 09:00:54 +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
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
Raphaël cdacf75e96 Fix taille des assets dans le boss fight 2023-11-04 15:30:55 +01:00
Raphaël ed3fbefdc5 Ajout projectile de la zone d'attaque 2023-11-04 15:19:45 +01:00
Tipragot 867ae7e457 J'aime bien ! 2023-11-04 03:34:55 +01:00
Raphaël d07f7bcc65 Ajout fonction qui detecte la mort 2023-11-04 03:16:42 +01:00
CoCo_Sol 5baa8bf2af lesajout du system de degat 2023-11-04 03:01:33 +01:00
906 changed files with 793 additions and 94 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

View file

@ -1,9 +0,0 @@
{
"end_image": "directory.png",
"offset": {
"x": 0,
"y": 0
},
"frame_count": 20,
"fps": 60
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 317 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 272 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 KiB

View file

@ -1,9 +0,0 @@
{
"end_image": "dark_desktop.png",
"offset": {
"x": 0,
"y": 0
},
"frame_count": 31,
"fps": 60
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Some files were not shown because too many files have changed in this diff Show more