9b76389698
dding missing doc and cooplean form
2021-05-26 10:56:06 +02:00
682b4388bb
fixing issues qith 3D/2D Renderer systems
2021-05-26 10:46:12 +02:00
cacc8d2347
import all assets
2021-05-25 20:12:20 +02:00
756daf0c17
import all assets
2021-05-25 20:11:23 +02:00
cf48cf8e3e
Merge remote-tracking branch 'origin/renderer' into renderer
...
# Conflicts:
# sources/main.cpp
2021-05-25 17:45:39 +02:00
e5e2739d73
compiling with templated component
2021-05-25 17:43:48 +02:00
0b23b9c5cb
fix namespaces + assets
2021-05-25 14:21:31 +02:00
5c78a4bd07
assets for player
2021-05-25 14:06:57 +02:00
95b1b2ebb7
trying inheriting from class T
2021-05-25 12:39:25 +02:00
e8aec2b7ef
fixing some issues in Drawables components and Render systems
2021-05-25 12:14:24 +02:00
43f1f6ad1f
adding Drawable2DComponent.hpp & Renderer2DSystem.hpp
2021-05-25 12:03:17 +02:00
8c3ef2a23c
Merge branch 'develop' into renderer
...
# Conflicts:
# lib/wal/sources/Component/Movable/MovableComponent.cpp
# lib/wal/sources/Component/Position/PositionComponent.cpp
2021-05-25 10:47:35 +02:00
b54c2ad26e
adding first version of templated system & component for drawables
2021-05-24 18:10:11 +02:00
384e812c19
Adding a grid centered component
2021-05-24 18:08:50 +02:00
6deade8ddc
Fixing namespace
2021-05-24 17:15:24 +02:00
199b286978
Fixing compilation
2021-05-24 16:58:11 +02:00
c097575c68
starting to add RectangleDrawable2DSystem.cpp
2021-05-24 16:15:07 +02:00
9ec3abab0e
Merge branch 'ecs' of github.com:AnonymusRaccoon/Bomberman into movements
2021-05-24 15:46:50 +02:00
f309ed8380
Merging game
2021-05-24 15:46:46 +02:00
c104a3ad99
Moving components and systems out of the ecs
2021-05-24 15:23:20 +02:00
54fe800549
Adding a state and scene utils
2021-05-24 14:59:28 +02:00
8a5dcdc0ad
Merge remote-tracking branch 'origin/renderer' into renderer
2021-05-24 11:46:59 +02:00
269ec94412
fixed compil and finished moving files to the game
2021-05-24 11:46:52 +02:00
3d5ea204b6
adding a RectangleDrawable2DComponent and moving files
2021-05-24 11:33:19 +02:00
60cfc7f9be
encapsulation of trace log
2021-05-24 10:59:29 +02:00
77534276ef
fix double definition of cast operator
2021-05-23 19:22:49 +02:00
7bab6e8b55
Merge branch 'renderer' into animations
2021-05-23 18:27:34 +02:00
89397c95d0
Merge branch 'develop' into renderer
2021-05-22 15:56:06 +02:00
d9c3772b9e
Iressource holds again a unload method
2021-05-22 14:13:31 +02:00
66c33b403c
creation of animation containers
2021-05-22 11:55:44 +02:00
c46c0bccd9
better management of drawing/display states for window
2021-05-22 01:47:45 +02:00
023890fd05
more conversion operator to avoid extracting data methods
2021-05-22 00:59:54 +02:00
f0c10aade6
vector are now proper struct, including conversion functions
2021-05-22 00:43:31 +02:00
d1d994fd29
fix indentation, now using tabs
2021-05-21 23:52:08 +02:00
bcab70bb56
fix ci
2021-05-21 17:11:47 +02:00
09b4c8cb56
rm logs debug
2021-05-21 17:09:19 +02:00
ace448763e
using ctor of Vector3 instead of C cast (CI fix)
2021-05-21 16:53:22 +02:00
69effd46dc
Merge branch 'master' of github.com:AnonymusRaccoon/Bomberman into develop
2021-05-21 16:38:30 +02:00
8323639e4f
resetting getter not const (due to poor lib design)
2021-05-21 16:30:53 +02:00
688b5d992d
fixing image getter not const and adding the window flags and icon support
2021-05-21 16:09:18 +02:00
5d5b63ae33
try explicit conversion
2021-05-21 15:20:21 +02:00
80e9d674e9
Fix documentation and remove friend keyword
...
Remove friend keyword and put variables in public instead
Fix documentation where the name of the component is not specified
Co-Authored-By: Benjamin HENRY <44569175+EternalRat@users.noreply.github.com >
2021-05-21 15:11:03 +02:00
54cb40aa0b
Modification on Controllable and Keyboard
...
Add float variable instead of bool for the axes movement, and use of a map for classic keys
Co-Authored-By: Benjamin HENRY <44569175+EternalRat@users.noreply.github.com >
2021-05-21 14:17:37 +02:00
61e04f760a
Add healthSystem
...
The component doesn't disable the entity anymore, the system does it by checking the component of the entity
Co-Authored-By: Benjamin HENRY <44569175+EternalRat@users.noreply.github.com >
2021-05-21 14:15:42 +02:00
536de9a488
add cube + color contructable from hsv
2021-05-21 13:32:35 +02:00
94312bd6ad
fix text display pb
2021-05-21 12:48:50 +02:00
22bad1036a
fix merge
2021-05-21 12:41:22 +02:00
e4bd77197a
singleton for window
2021-05-21 12:38:10 +02:00
5e0f5d5690
fuirst commit develop
2021-05-21 12:15:11 +02:00
35e6fe67c8
update workflow
2021-05-21 10:56:57 +02:00
Clément Le Bihan