40 Commits

Author	SHA1	Message	Date
Clément Le Bihan	d8396337dd	Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser ... # Conflicts: # sources/Map/Map.cpp # sources/Runner/GameScene.cpp # sources/Runner/PauseMenuScene.cpp # sources/Runner/Runner.cpp # sources/System/Controllable/ControllableSystem.cpp # sources/System/Lobby/LobbySystem.cpp	2021-06-19 14:39:43 +02:00
Zoe Roux	cb680b89da	Merging with develop	2021-06-19 13:50:27 +02:00
Clément Le Bihan	75ad53b40f	Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser ... # Conflicts: # CMakeLists.txt # sources/Runner/GameScene.cpp	2021-06-19 11:34:12 +02:00
Clément Le Bihan	afc1fda08e	resetting correct noclip spawn rate	2021-06-18 16:28:30 +02:00
Clément Le Bihan	cdba078231	first correct no clip version	2021-06-18 16:25:20 +02:00
EternalRat	a19536f389	parser done? (need to test a lot)	2021-06-18 15:49:05 +02:00
Askou	4acac815fd	fix print and useless operation	2021-06-18 15:30:18 +02:00
Askou	387734b7c5	remove changes on getRandomBonusType()	2021-06-18 14:09:34 +02:00
Askou	00b6f69443	Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into no_clip_fixes	2021-06-18 11:47:56 +02:00
Askou	2243bfc9f8	kill when no_clip ends in boxes	2021-06-18 11:43:59 +02:00
Clément Le Bihan	d9accd58bd	doesn't compile	2021-06-18 10:40:36 +02:00
Askou	aae3c6c64c	add new collision for map	2021-06-17 17:13:50 +02:00
Askou	72d93e8919	add bonus speed limit	2021-06-17 16:10:06 +02:00
Askou	991b77ad04	Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into update_texture	2021-06-17 14:49:19 +02:00
Askou	eef7c1ae25	remove return (SPEED UP) in bonus	2021-06-17 14:47:23 +02:00
Askou	55711dd343	change floor	2021-06-17 14:45:08 +02:00
Zoe Roux	e9c3f8e083	Fixing bonus collisions	2021-06-17 14:37:34 +02:00
Askou	d795f36747	distri for bonus	2021-06-15 15:56:27 +02:00
Askou	2c42af1c59	lower speed boost value	2021-06-15 14:59:51 +02:00
Askou	11370c890d	Add permanent bonuses except for wallpass	2021-06-15 14:35:59 +02:00
Askou	baac958615	change collision with bomb	2021-06-15 14:29:08 +02:00
Askou	c2e857ad7a	change player speed	2021-06-15 12:22:44 +02:00
Askou	bb2a9ec081	add enum for all collision	2021-06-15 11:58:53 +02:00
Askou	eefc560a81	fix random chance of bonuses	2021-06-15 11:56:02 +02:00
Askou	3219928f37	no clip with 5s timer	2021-06-15 10:39:10 +02:00
Askou	2a1d56ed3b	add no clip bonus	2021-06-15 10:35:06 +02:00
Askou	8126d4a7e4	add timer on noclipBonus	2021-06-15 09:25:26 +02:00
Askou	be48b46b7a	add noClip to bonus.hpp	2021-06-14 16:33:42 +02:00
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
HENRY Benjamin	93a4fa792c	removed ignore walls bonus (sorry clément :( )	2021-06-09 12:15:01 +02:00
HENRY Benjamin	5c357af61d	PlayerBonus system & component made (containing timer)	2021-06-09 12:05:33 +02:00
EternalRat	97b7a7d259	timer added to speedup bonus (15s)	2021-06-08 21:05:08 +02:00
EternalRat	58bbd1fb93	Update speedup bonus & fixing one bug (double bonus/...)	2021-06-08 20:37:10 +02:00
EternalRat	3009e34ac3	increased range + damage bonus added, just miss ignorewalls now & sprite for the explosionrange bonus	2021-06-08 20:12:09 +02:00
EternalRat	ee7b4c2c8f	merge from develop	2021-06-08 17:02:00 +02:00
EternalRat	4af99e75e5	bonus working, just miss 3 bonuses (cause bombholder isn't finish yet)	2021-06-08 16:14:37 +02:00
HENRY Benjamin	82e1f06534	rename Bonus folder => Items folder (bonus/malus should be inside)	2021-06-03 10:42:09 +02:00