41 Commits

Author	SHA1	Message	Date
Zoe Roux	b22a9f1c63	Merging with develop	2021-06-07 11:58:53 +02:00
Zoe Roux	f47dd669f1	Collisions are still broke	2021-06-07 11:37:16 +02:00
Zoe Roux	01ea9053fa	Making block solids	2021-06-06 16:54:27 +02:00
Clément Le Bihan	855a0c5bee	readding animation system component in addSystems & changing NULL to nullptr	2021-06-06 12:22:36 +02:00
Zoe Roux	f20445cdc8	Update systems to the new view	2021-06-05 18:42:10 +02:00
Zoe Roux	a40b61845a	Adding an iterator	2021-06-04 18:59:42 +02:00
Zoe Roux	0236aaa2ea	Merging with develop and reworking all systems	2021-06-04 01:04:05 +02:00
Zoe Roux	a11bd21ec3	Creating a basic view	2021-06-03 22:42:38 +02:00
Zoe Roux	0d37a560d7	Reworking the view	2021-06-03 18:20:37 +02:00
Arthi-chaud	666f1dbf2b	Merge branch 'develop' into wasm	2021-06-03 11:43:47 +02:00
arthur.jamet	f357eccd09	merging from develpo	2021-06-02 19:39:29 +02:00
Clément Le Bihan	883022d255	reenable map drawing	2021-06-02 18:17:32 +02:00
Clément Le Bihan	3790b2a8cd	first pr fixes from reviews	2021-06-02 18:14:44 +02:00
arthur.jamet	73c2ec5498	fix merge	2021-06-02 17:23:17 +02:00
Clément Le Bihan	e45942d532	merge develop into animations	2021-06-02 16:57:40 +02:00
Zoe Roux	88e086b272	Finishing to rework the drawable system	2021-06-02 16:22:26 +02:00
Zoe Roux	09d8b1a90b	Reworking drawable components	2021-06-02 16:18:26 +02:00
Clément Le Bihan	f245fe727b	Animation is working segfault on unload	2021-06-02 15:58:37 +02:00
Bluub	a3e04870ed	fix emrge conflict	2021-06-02 15:00:06 +02:00
arthur.jamet	ef0c323d94	addition + correct drawing modes	2021-06-02 14:33:52 +02:00
Bluub	d0205b68e6	public onCollide and onCollided	2021-06-01 17:45:09 +02:00
Bluub	349da67b29	runner with the collision system	2021-06-01 17:21:26 +02:00
Askou	03dc561bff	basic map with hole	2021-06-01 16:08:27 +02:00
Askou	c905803fc5	Add hole block and separate load/create map	2021-06-01 15:08:21 +02:00
HENRY Benjamin	87ef807308	add healthcomponent to breakable block	2021-06-01 11:54:01 +02:00
HENRY Benjamin	5aeb16b749	fix before merge (develop => map_generator)	2021-06-01 11:46:55 +02:00
Zoe Roux	87c5703c60	Adding a on death callback	2021-05-31 20:14:07 +02:00
HENRY Benjamin	0186a79858	undo changes	2021-05-31 17:52:28 +02:00
HENRY Benjamin	dd0d1e6fa2	little fix	2021-05-31 17:35:42 +02:00
HENRY Benjamin	38cbfa022e	basic map with unbreakable & breakable block	2021-05-31 17:32:30 +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	a8d7b077a2	Fixing movements	2021-05-31 11:20:31 +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	826ed80a97	Fixing display loop	2021-05-27 17:57:34 +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
Zoe Roux	6deade8ddc	Fixing namespace	2021-05-24 17:15:24 +02:00
Zoe Roux	199b286978	Fixing compilation	2021-05-24 16:58:11 +02:00
Zoe Roux	54fe800549	Adding a state and scene utils	2021-05-24 14:59:28 +02:00