Commit Graph

24 Commits

Author SHA1 Message Date
Zoe Roux
5293222f88 Resetting the velocity on death 2021-06-20 19:19:35 +02:00
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
6015b62664 Merging with develop 2021-06-18 17:07:17 +02:00
EternalRat
a19536f389 parser done? (need to test a lot) 2021-06-18 15:49:05 +02:00
Zoe Roux
63044f756a Switching keyboard layouts 2021-06-18 13:43:28 +02:00
Zoe Roux
8d9432c1f4 Handling buttons on key up 2021-06-18 12:42:51 +02:00
Clément Le Bihan
d9accd58bd doesn't compile 2021-06-18 10:40:36 +02:00
Zoe Roux
d424c07744 Finishing the replay button 2021-06-17 22:31:21 +02:00
Zoe Roux
c39884b2a6 Merging with develop 2021-06-16 12:52:53 +02:00
Zoe Roux
123fe91080 Renaming the select button 2021-06-15 14:03:07 +02:00
Askou
fbe2900f39 merge develop in no_clip_bonus 2021-06-15 12:23:39 +02:00
Askou
c2e857ad7a change player speed 2021-06-15 12:22:44 +02:00
Zoe Roux
01457a0cd5 Clearing the lobby on leave 2021-06-15 12:19:40 +02:00
Zoe Roux
06a6eb2ed7 Merging with develop 2021-06-14 13:50:47 +02:00
Zoe Roux
804361c763 Adding a lobby system 2021-06-11 11:31:31 +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
Zoe Roux
e24ad0fa50 Cleaning up movements 2021-05-31 11:42:39 +02:00
Zoe Roux
199b286978 Fixing compilation 2021-05-24 16:58:11 +02:00
Zoe Roux
f309ed8380 Merging game 2021-05-24 15:46:46 +02:00
TrueBabyChaise
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
TrueBabyChaise
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
TrueBabyChaise
7377301c4e Add basic controls components and system
KeyboardComponents/System + ControllableComponents/ControllableSystem
2021-05-20 17:59:34 +02:00