859 Commits

Author SHA1 Message Date
Zoe Roux f20445cdc8 Update systems to the new view 2021-06-05 18:42:10 +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
arthur.jamet 9b6cbaf948 add debug option in renderer system constructor 2021-06-05 13:46:27 +02:00
arthur.jamet 948b9b42c2 change default fps 2021-06-05 13:43:34 +02:00
arthur.jamet f657408e4f define loading functions for menu scenes 2021-06-05 12:26:24 +02:00
arthur.jamet 39a1739a26 better name for title screen scene 2021-06-05 12:20:02 +02:00
arthur.jamet f9c46d2120 add splashcreen scene in game states 2021-06-05 10:34:11 +02:00
Zoe Roux a40b61845a Adding an iterator 2021-06-04 18:59:42 +02:00
arthur.jamet e34c838da9 add hold callback on button 2021-06-04 17:03:24 +02:00
arthur.jamet 1f42e7d911 more scenes ID 2021-06-04 16:58:30 +02:00
arthur.jamet 294d67de6a setup debug mode 2021-06-04 15:50:22 +02:00
arthur.jamet d7a65c7d45 pull from develop + fix merge + add optimization flag 2021-06-04 15:06:01 +02:00
HENRY Benjamin fdd6ab8be7 Merge branch 'develop' into bonus 2021-06-04 14:54:32 +02:00
Askou fb65cc3613 fix bumper position 2021-06-04 14:42:57 +02:00
Zoe Roux eac5c2c847 Oups 2021-06-04 13:16:14 +02:00
arthur.jamet 8324eb48c2 remove specialt exture 2021-06-04 13:14:10 +02:00
Zoe Roux 181ccb7934 Using views for the collision system 2021-06-04 13:02:27 +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
Zoe Roux 306f07972d Reworking systems 2021-06-04 00:50:38 +02:00
Bluub dbd95c73d5 removing positino in controllable component 2021-06-04 00:15:13 +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
Bluub f141a6f4fa compiling with lua in cmake 2021-06-03 17:57:31 +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
Askou b8a7e52f13 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into bot_ia 2021-06-03 15:54:33 +02:00
Askou 09204179b5 basic bot_ia class template 2021-06-03 15:54:13 +02:00
HENRY Benjamin c345c49894 png added 2021-06-03 15:49:49 +02:00
arthur.jamet d69198ca1b remove unnecessary comment 2021-06-03 15:01:59 +02:00
arthur.jamet ba315e4010 add removed target to camera 2021-06-03 15:00:42 +02:00
HENRY Benjamin 378ba98050 added death animation through a callback onDeath 2021-06-03 14:58:03 +02:00
Bluub 06a7a2d3bf menu controllable but still needs view 2021-06-03 14:47:27 +02:00
arthur.jamet 63d6d8479b fix merge 2021-06-03 12:33:57 +02:00
HENRY Benjamin 45ee02e06b animator has been made for right/left/up/down 2021-06-03 12:29:46 +02:00
arthur.jamet a0ffafbd6d Revert "Revert "use custom html""
This reverts commit c40dc58330.
2021-06-03 12:03:06 +02:00
arthur.jamet c40dc58330 Revert "use custom html"
This reverts commit 0e00a599f6.
2021-06-03 12:02:49 +02:00
arthur.jamet c1be763a9b Revert "better workflow for wasm compilation"
This reverts commit 56f1b321c0.
2021-06-03 12:01:39 +02:00
Bluub c68389d1e8 menu scene first step 2021-06-03 11:53:32 +02:00
arthur.jamet 173f787975 Merge branch 'wasm' of github.com:AnonymusRaccoon/Bomberman into wasm 2021-06-03 11:47:16 +02:00
arthur.jamet 56f1b321c0 better workflow for wasm compilation 2021-06-03 11:46:56 +02:00
Arthi-chaud 666f1dbf2b Merge branch 'develop' into wasm 2021-06-03 11:43:47 +02:00
HENRY Benjamin daf5919523 start animator 2021-06-03 11:38:15 +02:00
arthur.jamet 0e00a599f6 use custom html 2021-06-03 11:19:22 +02:00
Bluub 36657affc6 menu controllable system and buttonComponent 2021-06-03 11:07:01 +02:00
arthur.jamet b0337ae2da fix breakable wall texture's white line 2021-06-03 10:56:42 +02:00
HENRY Benjamin 82e1f06534 rename Bonus folder => Items folder (bonus/malus should be inside) 2021-06-03 10:42:09 +02:00
Askou df10f9f011 add colors to upper_floor 2021-06-03 10:05:40 +02:00