859 Commits

Author SHA1 Message Date
Clément Le Bihan 5b126c1b32 Merge branch 'develop' into collision_check_clem 2021-06-07 21:35:32 +02:00
Clément Le Bihan c16f264920 some non breaking changes fix (std::move + One ctor with opt params instead of multiple ctors) 2021-06-07 19:21:52 +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
arthur.jamet d41670ae40 some buttons for the settings menu 2021-06-07 17:10:33 +02:00
Bluub cc50f90c6f fix cmake lua install 2021-06-07 17:00:43 +02:00
HENRY Benjamin 5fc43dc15a add pi_number define (fix windows) 2021-06-07 16:50:50 +02:00
HENRY Benjamin 1081574ba7 old collisioncomponent (runner.cpp) 2021-06-07 16:42:58 +02:00
Bluub b7bf544b48 basic tag component 2021-06-07 16:42:51 +02:00
HENRY Benjamin e59cc52f6e removed 1 com 2021-06-07 16:41:47 +02:00
HENRY Benjamin a00b14c769 using Vector2.angle() 2021-06-07 16:41:11 +02:00
Bluub 7a8a76c845 fix merge conflict 2021-06-07 16:23:02 +02:00
arthur.jamet 80afc9a740 add main menu controllables 2021-06-07 16:15:08 +02:00
arthur.jamet 37dbfa7fa7 button componenent now a templated class 2021-06-07 15:56:52 +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
Askou 0458bde5ae add unique_ptr for sound 2021-06-07 15:39:57 +02:00
Askou 7d7ede07e9 Sound for jump + fix sound component function name 2021-06-07 15:31:57 +02:00
arthur.jamet 5bba1f68e8 now use texture instead of images 2021-06-07 15:18:28 +02:00
Zoe Roux 328ad91c43 Fixing unknown bug 2021-06-07 14:49:25 +02:00
Zoe Roux e0683c0df0 Trying to merge with develop 2021-06-07 14:40:24 +02:00
HENRY Benjamin 78d026114e init 2021-06-07 14:35:19 +02:00
arthur.jamet 8174d5f4ac add clock 2021-06-07 12:33:37 +02:00
Askou a0ea2576a5 add Sound component 2021-06-07 12:33:18 +02:00
arthur.jamet ea69116255 main menu button hover callback 2021-06-07 12:14:53 +02:00
HENRY Benjamin 9e6b3b9e40 fix doc 2021-06-07 12:05:37 +02:00
HENRY Benjamin 41f543ee19 animator fix 2021-06-07 12:02:01 +02:00
Zoe Roux b22a9f1c63 Merging with develop 2021-06-07 11:58:53 +02:00
arthur.jamet d0d5935ae1 some things for the menu scene 2021-06-07 11:52:03 +02:00
Askou fb9e5710b1 replace music system by sound system 2021-06-07 11:46:27 +02:00
Askou 8e93e84006 add sound/music component 2021-06-07 11:43:06 +02:00
Zoe Roux f47dd669f1 Collisions are still broke 2021-06-07 11:37:16 +02:00
Askou e04c8d0bd4 add basic music manager 2021-06-07 11:22:45 +02:00
Bluub 75f6b04e9a get the 4 returns of the update function 2021-06-07 11:19:23 +02:00
arthur.jamet e094a7d5d9 compoenent for title screen 2021-06-07 11:03:47 +02:00
Bluub 2c3fbee797 moving player up with the lua script 2021-06-07 10:55:22 +02:00
Bluub 19cd80a3ff menu navigation, adding images 2021-06-07 10:28:00 +02:00
HENRY Benjamin 6de8505cfd levitatecomponent on bonus + system + fix something in model (raylib) 2021-06-07 10:21:51 +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
HENRY Benjamin 78f2be8cb1 obj rotation & healthsystem fix bonus 2021-06-07 09:31:55 +02:00
Bluub 39f417358d loading the file and checking if there is an update function 2021-06-07 00:51:29 +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
Clément Le Bihan e58cca4a58 Merge pull request #99 from AnonymusRaccoon/height_map_generator
add basic depths with stairs and bumper to access it
2021-06-06 12:16:22 +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
Askou 9dbb1d6d6d basic music component 2021-06-06 10:10:53 +02:00
arthur.jamet 7ff9196a4f remove previously trashed file 2021-06-06 09:33:05 +02:00
Zoe Roux 1b4e8d2151 Optimizing view iterators 2021-06-05 19:55:38 +02:00
Zoe Roux f3ce14caca Cleaning up callbacks 2021-06-05 19:11:26 +02:00