Commit graph

201 commits

Author SHA1 Message Date
Yannis 161dfc1c24 Changement du nom des OST (dsl Kerrian mais il fallait bien) 2024-01-14 18:43:16 +01:00
Yannis 7ff96fe5c9 Retrait de la grande vitesse du joueur pour les tests 2024-01-13 23:33:27 +01:00
Yannis b65fb9d127 Fix du crash lors de la mort du joueur 2024-01-13 23:30:27 +01:00
Yannis 28df17050f Update du pdn tileset 2024-01-13 23:17:02 +01:00
Yannis af05762706 Retrait des modifications sur le joueur 2024-01-13 23:16:38 +01:00
Yannis e043093748 Ajout des entrées de temples 2024-01-13 23:15:08 +01:00
Yannis 28a4cf1db0 Nettoyage du code 2024-01-13 22:57:07 +01:00
Yannis 29adfda8dd Fix dans la map 2024-01-13 22:50:21 +01:00
Yannis 989587379a Fix des problèmes lors du merge 2024-01-13 22:19:42 +01:00
Yannis 323e190474 Merge remote-tracking branch 'origin/main' into game_assembly
# Conflicts:
#	src/main.py
2024-01-13 21:42:10 +01:00
Yannis ee17be37e2 Merge pull request 'delta_time' (#34) from delta_time into main
Reviewed-on: #34
Reviewed-by: Adastram <adastram@noreply.tipragot.fr>
2024-01-13 20:05:55 +00:00
Yannis 6cd2591659 Fix du mouvement des particules 2024-01-13 10:44:17 +01:00
Yannis 277ef41773 Fix du mouvement du loup 2024-01-13 10:40:46 +01:00
Yannis 9e132d48d3 Fix du calcul du mouvement des entités 2024-01-13 10:30:22 +01:00
Yannis 15fad80c2e Implementation du delta time pour la caméra 2024-01-13 10:29:53 +01:00
Yannis 46ca725a7e Implementation du delta time pour les entités 2024-01-13 10:24:05 +01:00
Yannis e3ea7cbed1 Ajout d'un vrai delta time 2024-01-13 10:09:21 +01:00
Adastram 561934e4ef Merge pull request 'Render_Fade' (#33) from Render_Fade into main
Reviewed-on: #33
Reviewed-by: Yannis <yannis@noreply.tipragot.fr>
2024-01-13 08:40:44 +00:00
Adastram cc79e5f22e Implemented .fade_in() and .fadeout(). Added fade at game start 2024-01-12 23:42:04 +01:00
Adastram bba73eeddd Upgraded main version in Render_Fade 2024-01-12 23:34:52 +01:00
Yannis 7c352d0379 Merge pull request 'sliders' (#32) from sliders into main
Reviewed-on: #32
Reviewed-by: Adastram <adastram@noreply.tipragot.fr>
2024-01-12 22:29:32 +00:00
Adastram fcc5d1633b Added Fade in main menu 2024-01-12 23:24:50 +01:00
Yannis 93d568f996 Merge remote-tracking branch 'origin/main' into sliders
# Conflicts:
#	src/engine/event_handler.py
2024-01-12 23:17:46 +01:00
Yannis 1644df5481 Petit nettoyage 2024-01-12 23:14:47 +01:00
Yannis 0464804b81 Suppression du code de test 2024-01-12 23:10:02 +01:00
Yannis c9ef08e2bc Fix du méga rectangle en debug en mode responsible du slider 2024-01-12 23:09:20 +01:00
Yannis f157d33f16 Ajout du callback lors du changement de la valeur 2024-01-12 22:36:27 +01:00
Yannis aff8f60b67 Ajout de la suppression des area sliders 2024-01-12 18:42:29 +01:00
Yannis 582060814e Ajout du rendu du rail du slider 2024-01-12 18:42:06 +01:00
Yannis 4128f32d26 Ajout du rendu et début d'implementation des sliders 2024-01-12 18:16:47 +01:00
Yannis 37cdffc8e3 Ajout du callback du hover 2024-01-12 17:17:02 +01:00
Adastram ebaa8accd4 Started debug of fade_in 2024-01-12 17:13:58 +01:00
Yannis 93b7e95dca Fix du callback du slider qui est appelé même si le slider n'était pas tenu 2024-01-12 14:31:57 +01:00
Adastram 71c9475e7a Started fadein implementation 2024-01-11 20:55:55 +01:00
Yannis d5674c7e63 Début d'implementation des callbacks de sliders 2024-01-11 20:42:36 +01:00
Yannis cfb82a5ee7 Ajout de la responsibility des sliders 2024-01-11 17:45:23 +01:00
Adastram d81a3e0452 implemented fadeout 2024-01-11 15:03:07 +01:00
Adastram 777b6adde4 Corrected docstring 2024-01-11 15:02:39 +01:00
Adastram 06a2d7085b Reorganized GUI update to allow fadeout in menus 2024-01-11 14:52:55 +01:00
Adastram 4c79436624 Merge pull request 'Prevented Player from moving when dialog is occuring' (#30) from BlockMoveWhenTalk into main
Reviewed-on: #30
Reviewed-by: Yannis <yannis300307@gmail.com>
2024-01-11 10:03:40 +00:00
Adastram daa7ca46d4 Added doc string 2024-01-11 10:58:56 +01:00
Adastram 67fef0b82e Edited dialogs_manager import 2024-01-11 10:51:14 +01:00
Adastram ce14e45e8f Fixed engine import 2024-01-11 10:50:54 +01:00
Adastram f5c1f8bc63 Moved pause to dialogs_manager 2024-01-11 10:42:42 +01:00
Adastram 9e400598a3 Imported whole engine and moved pause() handling from event_handler 2024-01-11 10:42:26 +01:00
Adastram 8cbe1a3727 Edited default zoom value 2024-01-11 10:41:57 +01:00
Adastram e8343160d4 Edited lock to block all interraction including animation instead of just the movements 2024-01-11 10:30:34 +01:00
Adastram 1f8444bc0b Edited .pause() function to lock all unlocked entity instead of blocking update function, and .resume() to unlock only non-locked entity before pause 2024-01-11 10:29:43 +01:00
Adastram 15565c6712 Added Game satuts display in debug 2024-01-11 09:55:24 +01:00
Adastram ddb27bfd5a Added sync between dialogs and game pause 2024-01-11 09:54:12 +01:00