859 Commits

Author SHA1 Message Date
Zoe Roux 8009c0619b Fixing refill times 2021-05-31 17:00:46 +02:00
Zoe Roux ae1dc58995 Removing the bomb holder component from this pr 2021-05-31 16:19:25 +02:00
Zoe Roux 43bd781175 Adding a bomb holder system 2021-05-31 16:18:24 +02:00
Bluub fcbbfd04d8 fix doc 2021-05-31 15:33:31 +02:00
Bluub 761eaabddb adding unit test and constructor for collusion components without callbacks 2021-05-31 15:26:35 +02:00
HENRY Benjamin afcf15c91e Merge branch 'develop' into map_generator 2021-05-31 15:06:34 +02:00
Bluub 47aac95801 adding unit test crashing on addEntity 2021-05-31 14:54:53 +02:00
Bluub 79aa4cc86c bounding of box collision in the collisionComponent 2021-05-31 13:06:03 +02:00
Zoe Roux d034514e28 Adding tests and cleaning up 2021-05-31 12:02:19 +02:00
Zoe Roux e24ad0fa50 Cleaning up movements 2021-05-31 11:42:39 +02:00
Zoe Roux 05ead59d0a Merge branch 'movements' of github.com:AnonymusRaccoon/Bomberman into movements 2021-05-31 11:20:38 +02:00
arthur.jamet cbbde0bc0c gamepad ecs 2021-05-31 12:48:59 +02:00
Zoe Roux a8d7b077a2 Fixing movements 2021-05-31 11:20:31 +02:00
arthur.jamet b92b35f191 ressources are not reloadable, ressource interface deleted 2021-05-28 12:41:21 +02:00
TrueBabyChaise 4942bd8e99 Remove ColliderComponent and Fix issues on map 2021-05-28 10:10:18 +02:00
Zoe Roux 47359e2a14 Allowing the window to be closed 2021-05-27 23:08:48 +02:00
Zoe Roux b88172b667 Adding a player 2021-05-27 23:02:39 +02:00
Zoe Roux 4ef26b9f87 Merge branch 'renderer' of github.com:AnonymusRaccoon/Bomberman into renderer 2021-05-27 17:57:39 +02:00
Zoe Roux 826ed80a97 Fixing display loop 2021-05-27 17:57:34 +02:00
arthur.jamet 7989587c81 Merge branch 'assets' into renderer 2021-05-27 17:50:05 +02:00
Zoe Roux a5d746fa47 Reworking draw systems 2021-05-27 17:38:12 +02:00
Zoe Roux a26725f5a5 alalalallalalllala 2021-05-27 16:37:22 +02:00
Bluub 16ea3e3d80 fix compilation, model is a 3D drawable 2021-05-27 16:27:48 +02:00
arthur.jamet 5469b6f169 model is now a 3D drawable 2021-05-27 15:46:18 +02:00
arthur.jamet 70d69b0621 player 2021-05-27 15:04:47 +02:00
arthur.jamet b7bd6d7a72 player skins 2021-05-27 15:18:43 +02:00
Zoe Roux c6ab6542e0 Starting the grid centered system 2021-05-27 12:11:34 +02:00
Clément Le Bihan d69a4f8ee2 delete Vector3.cpp and rm trailing space 2021-05-27 12:01:43 +02:00
arthur.jamet 26eebc26bc unique file for player model + animation 2021-05-27 10:52:10 +02:00
arthur.jamet 7f1e8ab398 animation 2021-05-27 10:37:44 +02:00
Clément Le Bihan dee8c554c3 delete Vector3.cpp and rm trailing space 2021-05-26 18:42:18 +02:00
Clément Le Bihan 07e2d5bc35 adding a true user-defined conversion operator 2021-05-26 18:40:18 +02:00
Clément Le Bihan 6bd7a46ea9 rm Utils class 2021-05-26 18:36:26 +02:00
Clément Le Bihan c3c6f1503c rm unwanted actions (update cam) 2021-05-26 18:01:51 +02:00
Clément Le Bihan e70dbd5b3b adding operator* for vector3f to please ZOE the tyrant 2021-05-26 17:21:01 +02:00
Clément Le Bihan 864e75c555 first pr reviews fixes 2021-05-26 17:07:43 +02:00
Clément Le Bihan 8cdae3a3fc oups x2 2021-05-26 17:00:54 +02:00
Clément Le Bihan 0000136381 quick cleanup 2021-05-26 16:54:58 +02:00
Clément Le Bihan 7da7e50f68 using the utils function (BBM vector3 -> RAY vector3) 2021-05-26 16:50:52 +02:00
Clément Le Bihan b2659c3272 change window draw function to IDrawable 2021-05-26 16:38:27 +02:00
Clément Le Bihan c12ecf6d8b renderers seems to work 2021-05-26 16:24:43 +02:00
TrueBabyChaise 8d675c71e0 Fix comments
Co-Authored-By: Benjamin HENRY <44569175+EternalRat@users.noreply.github.com>
2021-05-26 16:23:48 +02:00
TrueBabyChaise f79c6f46a3 Map + ColliderComponent
Basic map and ColliderComponent, system hasn't be done at the moment

Co-Authored-By: Benjamin HENRY <44569175+EternalRat@users.noreply.github.com>
2021-05-26 16:15:16 +02:00
Clément Le Bihan 214b9a4674 systems whould work but i don't know how to put my entity in a scene 2021-05-26 15:43:42 +02:00
Clément Le Bihan 16f18c406d still some issues with drawable3D component 2021-05-26 15:36:08 +02:00
Clément Le Bihan 2841ba5d6b compiling but renderer doesn't render 2021-05-26 15:22:51 +02:00
Clément Le Bihan 8a9a5bb32c adding a screen renderer system 2021-05-26 15:18:44 +02:00
Clément Le Bihan 408e955b52 big merge and fixing unit test compil 2021-05-26 11:38:21 +02:00
Clément Le Bihan a5a336e1f5 Merge branch 'develop' into renderer
# Conflicts:
#	CMakeLists.txt
#	lib/wal/CMakeLists.txt
#	sources/Component/Movable/MovableComponent.cpp
#	sources/Component/Position/PositionComponent.cpp
#	sources/Component/Position/PositionComponent.hpp
#	sources/System/Movable/MovableSystem.cpp
#	sources/System/Movable/MovableSystem.hpp
#	sources/main.cpp
2021-05-26 11:31:28 +02:00
Clément Le Bihan 1dd2117f8d Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into ecs 2021-05-26 11:22:20 +02:00