60 Commits

Author	SHA1	Message	Date
HENRY Benjamin	2955cd76a7	added a bandage to a huge wound (collisionsystem wasn't calling the two callbacks, just one, now it's still only one, but the bonuses are applied only if you're on them	2021-06-09 22:22:27 +02:00
Clément Le Bihan	fdcea71fcd	fixing keyboard (he was switching between a and d)	2021-06-09 17:43:38 +02:00
HENRY Benjamin	19b91d58a5	need to fix collisionsystem	2021-06-09 16:13:23 +02:00
HENRY Benjamin	3a99e5913b	fixed healthsystem, using callbacks to create bonuses and removed bonuscomponent (useless)	2021-06-09 14:49:37 +02:00
Zoe Roux	78da9a5ccc	Merging with develop	2021-06-09 14:21:49 +02:00
Zoe Roux	a9669a7858	Disabling bomb collisions	2021-06-09 14:20:01 +02:00
Zoe Roux	b5264bea3e	Making bombs collidables. For now thats not really a good idea	2021-06-09 12:30:14 +02:00
Zoe Roux	7aa356aeca	Merging with develop	2021-06-09 12:17:20 +02:00
Zoe Roux	a6b4f1717a	Finishing exploson radius	2021-06-09 12:10:19 +02:00
Askou	b6b2b5ffc9	fix useless if that called STAIRS enum	2021-06-09 10:57:55 +02:00
Askou	6f24139e29	remove stairs	2021-06-09 10:45:14 +02:00
Askou	8f92e7a337	replace stairs by bumper and add assets for it	2021-06-09 10:28:28 +02:00
EternalRat	ee7b4c2c8f	merge from develop	2021-06-08 17:02:00 +02:00
Clément Le Bihan	f74c053c80	Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into collision_check_clem ... # Conflicts: # sources/Map/Map.cpp # sources/Map/Map.hpp	2021-06-08 16:19:32 +02:00
EternalRat	4af99e75e5	bonus working, just miss 3 bonuses (cause bombholder isn't finish yet)	2021-06-08 16:14:37 +02:00
Clément Le Bihan	395566598c	last fixes	2021-06-08 12:02:56 +02:00
Clément Le Bihan	d08613a9d4	zoe has to smile !	2021-06-08 11:58:30 +02:00
Clément Le Bihan	aba85c918e	adding QoL changes	2021-06-08 01:10:15 +02:00
Clément Le Bihan	ca930db44d	more cleanup	2021-06-08 00:55:32 +02:00
Clément Le Bihan	556021a4ef	map colliders seems nice	2021-06-08 00:35:34 +02:00
Clément Le Bihan	22606ecf68	giving the collided Axis for context to callback on collisions	2021-06-08 00:19:34 +02:00
Clément Le Bihan	65af11f3f9	collisions are working ok with user defined offsets	2021-06-07 23:37:51 +02:00
Zoe Roux	31f712531a	Merging with develop	2021-06-07 21:58:07 +02:00
Zoe Roux	fe9a650427	Making walls breakables	2021-06-07 21:47:04 +02:00
Clément Le Bihan	b7d43fef6a	starting to look into collisions	2021-06-07 18:01:19 +02:00
Zoe Roux	7234d51130	Allowing entities to be created and removed	2021-06-07 17:57:45 +02:00
Zoe Roux	30a7da899f	Merge pull request #116 from AnonymusRaccoon/ecs ... Views of entities and components	2021-06-07 15:54:23 +02:00
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
arthur.jamet	95761b75b7	second floor hole asset	2021-06-07 10:17:53 +02:00
arthur.jamet	c7554c6b97	assets for hole on second flor	2021-06-07 09:39:00 +02:00
Zoe Roux	01ea9053fa	Making block solids	2021-06-06 16:54:27 +02:00
Clément Le Bihan	96713ba549	fixing naming issue	2021-06-06 12:11:08 +02:00
Clément Le Bihan	d6992701df	clion coding style refactor	2021-06-06 12:09:37 +02:00
Tom AUGIER	638cdaa58c	Merge branch 'develop' into height_map_generator	2021-06-05 17:36:04 +02:00
Askou	6e26763dc7	fix norm	2021-06-05 17:31:20 +02:00
Askou	66e2168e65	fix merge	2021-06-05 17:29:53 +02:00
Askou	fb65cc3613	fix bumper position	2021-06-04 14:42:57 +02:00
arthur.jamet	8324eb48c2	remove specialt exture	2021-06-04 13:14:10 +02:00
arthur.jamet	da972a36e8	remove texture applying on model with complex materials	2021-06-04 11:09:20 +02:00
Zoe Roux	0236aaa2ea	Merging with develop and reworking all systems	2021-06-04 01:04:05 +02:00
arthur.jamet	a48c0b7460	rename assets folder for map	2021-06-03 16:49:14 +02:00
arthur.jamet	c7ab528e86	map generator: use variable to avoir strings repetition	2021-06-03 16:40:12 +02:00
arthur.jamet	b0337ae2da	fix breakable wall texture's white line	2021-06-03 10:56:42 +02:00
Askou	df10f9f011	add colors to upper_floor	2021-06-03 10:05:40 +02:00
Zoe Roux	a3804c170f	Optimizing component handling	2021-06-02 21:29:14 +02:00
arthur.jamet	f357eccd09	merging from develpo	2021-06-02 19:39:29 +02:00
TrueBabyChaise	777cdf29fe	add collision	2021-06-02 16:51:11 +02:00
TrueBabyChaise	0d7d26b0f9	add basic depths with stairs and bumper to access it	2021-06-02 15:03:13 +02:00
Askou	07f466ca67	fix coding style	2021-06-01 17:30:58 +02:00