This repository has been archived by the owner on Jan 2, 2021. It is now read-only.
Fix 1hp player #80
Merged
Fix 1hp player #80
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yanis-fourel
added
priority:low
yanis-fourel
requested review from
BenjaminPraud,
Pierre-Genest and
Mathieu-Lala
Mathieu-Lala
approved these changes
Nov 12, 2020
BenjaminPraud
approved these changes
Nov 12, 2020
Mathieu-Lala
added a commit
that referenced
this pull request
Nov 19, 2020
* init: proto state of art (imgui/glfw/glew/glm) chore: initialize cmake+conan , sanitizers target: app + engine feature: imgui demo window + glfw print events * feat: add handling of event * fix: build VS Release mode (Debug still broken) * chore: set fmt/spdlog header only; feat: add record events to json * feat: add hello triangle opengl * feat: add resize/move; fix: replay event * chore: add CI github * hotfix: matrix.arch * fix: pipeline hello world * hotfix: typos * chore: CI small conan * hotfix: typos * hotfix: typos * chore: CI add conan build * chore: add generate tools script used in pipeline * chore: add install script * hotfix: path * hotfix: path * hotfix: path * hotfix: typos * hotfix: path * hotfix: path * hotfix: path * hotfix: path * hotfix: compiler version override * hotfix: compiler package * chore: conditional stdlib + full conanfile * chore: add conan sys require enabled * chore: add build on pipeline * hotfix: path * hotfix: path * chore: complet cmake env * chore: set new profile conan * fix: compiler version * hotfix: compiler version * hotfix: compiler version * hotfix: compiler version * fix: version compiler * chore: suppress warn on error, explicit opengl * chore: add pkg-config * hotfix: add gl dump * hotfix: add gl dump * hotfix: add gl dump * fix: pipeline v1 working * refact: window class lighter, moved content in core * feat: add joysticks handling * refact: bump v0.1.5 * feat: add display debut joystick * hotfix: build windows + controller buttons windows * feat: add texture * Update joysticks management (#3) * feat: refact joystick management + record joystick event * hotfix: include vector * hotfix: it.base() * Camera + shader improvement (#4) * Added camera system + Improved shader handling * Extracted `draw` method from compononent to system Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat map gen (#5) * Simple Tilemap map builder + Tile factories * Tile fusion to limit entity count * Dungeon generation v1.0 * Added corridor width as parameters Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fullscreen (#6) * feat: add fullscreen / args flag / refact singleton core * chore: update pipeline add release mode; simplified event core * hotfix: pipeline build type * hotfix: update pipeline build type * chore: docopt set shared * chore: pipeline add step launch * hotfix: ls * hotfix: add printf in script * hotfix: pipeline backslash * hotfix: pipeline arch * chore: pipeline fix build folder * chore: pipeline fix build folder * hotfix: update build dir * chore: mindows change ouput path * chore: windows change ouput path * hotfix: set reset output path & docopt static * dump version v0.1.10 * fix: add fullscreen / send event to Game * Fix/warning (#8) * refact: cleanup * fix: bump version 0.1.12 * A few documentation of the project (#11) * doc: adding state_of_art * doc: add structure * doc: add mvp + ui * doc: update mvp alpha / delivery * Big changes (#12) * chore: upgrade imgui/conan version, style: cleanup * chore: add warning pop * hotfix: cast * hotfix: cast * hotfix: msvc warning * chore: remove docopt use cli11 * refact: split main in 2 files; chore: add engine version * Doc: Move GDD in doc folder (#13) * [ADD] 1 page GDD * [ADD] GDD 10 page * doc: move gdd in doc folder * doc: remove old gdd files Co-authored-by: Pierre-Genest <pg.e@outlook.fr> * Refactor component (drawable / position / scale) & Change camera / coordinates system (#14) * feat: moving square; new camera * refact: add Position/Velocity/Scale component, feat: add display mode; refact: camera & shaders * fix: include path * doc: add screenshot * fix: windows build error * refact: split components in different files; doc: add comments * doc: update README; add CI template; conan graph (#15) * Add collision & acceleration / Cleaning shaders / Adding first "enemies" (#18) * feat: add basics pursue AI * feat: cleaner camera movement; shader grid; add hitbox component * feat: add collision * feat: add enemy attack and player health (#20) * Fix/map gen (#17) * Fixed reccurent crash on map generation * Fixed warnings * fixed warning * Attempt to fix warning on linux * warning fix on linux build * linux warning fix attempt Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/signals (#23) * Init competences Test signals * Create player and movement files * Player movement with signals Remove unused files * Rename Movement.hpp -> GameLogic.hpp Create a signal call for game logic * doc: update README / issue_template; chore: add ignore branch tmp/doc (#24) * doc: update README / Issue_template; chore: add ignore branch tmp/doc * chore: fix pipeline on pull request * Feat/map gen entities (#22) * Fixed reccurent crash on map generation * map generation debug window * Restored camera2d and improved its api * Changed objects displayed size * Dungeon terrain despawn * Fixed dungeon tiles transforms * Fixed camera2d projection computation * de-commented enemy spawn re-commented level entity optimisation that causes issue * Changed player color * Basic enemy spawning logic * Enemy and player spawn in dungeon. Z coord handling attempt. still WIP. * simplified player teleportation code * Proper and clean Z-coordinate handle * removed unused variable in shader Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * doc: update readme with badge (#27) * bump: version 0.2.0 * Refact/compile time (#29) * refact: rename files / use forward decl; adding namespace & formatting * refact: remove useless comment * added needed include for windows build (#30) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fight v2 (#31) * feat: add enemy & player attack, instead of range of damage * feat: add user cast spell + kill enemy + xp * fix: msvc warnings * DIfferenciated floor type + some map gen bug fixes (#34) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add state loading/ingame/gameover (#35) * Fixed #36 (#37) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline only on PR * fix: pipeline only on Push * fix: pipeline + add cache conan (#40) * Feat/exit door (#38) * Exit door generation * Improve dungeon seed gestion + added Spam regenerate button on debug GUI * Changed dungeon seed type back to unsigned int due to warnings * moved floor generation process to a fonction * Fixed wrong corridor size issue Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline remove step conan cache * re-added tile fusion feature to improve perf (#43) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * refact: shader in core; feat: add color changement; perf: 60fps (#42) * refact: shader in core; feat: add color changement; perf: 60fps Co-authored-by: Yanis-F <yanis.fourel@gmail.com> * Feat/hud2.0 (#41) * [ADD] non dynamic HUD * [FIX] crash but no boss implementation yet * [Fix] compilation linux * [Add] enemy boss modif * [FIX] compilation linuxx * [Fix] conflict merge Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * texture implementation (#44) * refact: shader in core; feat: add color changement; perf: 60fps * feat: add texture as component * Feat/audio (#45) * Basic soud playing system * Fixed audio loading * Improved Sound api * Added audio file caching * fixed warning * fixed typo in conan cmake config * Restore windows full fullscreen by default * editted obsolete doc comment * fix: warning unix + add imgui+fmt helper + feat: collision+velocity smoother (bugged) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Made boss spawn + fixed boss display (#48) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/boss (#49) * [ADD] Dropping key under the map and boss with 1HP to test leveling and drop * [ADD] drop key + Hud change * [FIX] Destroying boss when restarting level * [FIX] Destroying key when restarting level * [ADD] Boss pursiut * [FIX] Boss Hp to normal * [FIX] linux build * [Modif] add tag enemy to Boss Co-authored-by: Pierre-Genest <pge@outlook.fr> * feat: add spritesheet component and gif animation (#50) * feat: add spritesheet component and gif animation * doc: update screenshot/conan grph/version * fix: msvc contexpr virtual function not supported * Feat/level transition (#51) * Key pickup * onNextLevel event + Door interraction * fix: build linux Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Added basic audio assets (#52) * Added basic audio assets + improved audio API * Added deaths sounds Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/json data (#53) * feat: Create player / class from json * fix: creation of player and class with json * fix: reorganize header * fix: newline at end of files * other: remove comments * fix: build linux * bump: version 0.2.17 Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Lint + better data folder management (#54) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * Feat/settings (#55) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * add: data_folder in app.ini * fix: msvc warning * fix: crash singleton in .data * fix: warning release mode * Fixed crashed if no available audio device was available (#56) * Fixed crashed if no available audio device was available * Fixed audio not working * chore: remove launch ubuntu from pipeline Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/fireball (#57) * feat: add fireball (bugged) * Fixed audio not working (#58) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/animation (#59) * feat: add severals animations in json spritesheet * fix: warning msvc * fix: focus bug * Feat/screenshake (#60) * feat: add screenshake v1 * chore: add args on script tools * hotfix: msvc warning * hotfix: msvc warning * Feat/spells management (#62) * + Spell database + Spellslots system for enemies * Added spell slots to player * Made classes spells configurable * refact: same feature but simplier Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/joystick movement (#64) * feat: Add player movement with controller * other: update version * fix: Fix compilation * Feat/debug console (#63) * tmp fix of ImGui keyboard events * Extracted ImGui console to separate class * Basic command system * Basic command autocompletion system * First command : Kill * xp commands * final touches + set music volume * chore: add launch to pipeline; fix optional include * fix: pipeline & include * fix: pipeline * chore: commenting pipeline * Update Core.hpp Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Test/init suite (#65) * tests: add coverage (bugged) * fix: exclude correctly system and conan files Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Test/golden (#66) * tests: add coverage (bugged) * fix: exclude correctly system and conan files * feat: add screenshot * Refact/design core (#67) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * Feat/player class switch (#68) * Class database + buy class event * remove "name" field in class config * Added children class * Class config : children are now class names * buyClass commands now takes class name * Added setSpell command + fixed console not clearing on command * Player knows which class he bought * Fixed unix warning * Added icon to classes * fix unix warning Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * fixed wrong class db path (#71) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/camera player movement (#75) * feat: Add attacks on controller * feat: update camera * fix: fix compilation * fix: update camera viewport * fix: controller attack buttons * Feat/hud3.0 (#74) * [ADD] some visual for HUD * Added skill point system * [ADD] HUD3.0 added * [FIX] Linux compilation * [fix] Linux Compilation fix * [fix] Linux Compilation fix * [fix] Linux Compilation fix Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/particule (#72) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * feat: add simple particule system * hotfix: .hpp -> .cpp * hotfix: .hpp -> .cpp * revert: develop db data Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> * Added rotation (#73) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * current HP change according to changes to max hp (#80) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/better collisions (#78) * Fixed crash if spell hit multiple walls at once * Actual good keyboard player movements. Debug only * Better collisions * Fixed collision bug that allows moving entity to overlap Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Fixed #77 : added attribute "starter" to class database (#79) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/doc and test (#81) * doc: updated * fix: console completion * Chore/more ci (#82) * tests: add fuzz + travis * chore: add build and coverage to travis * chore: fix test * chore: add codecov token * assets modif (#84) Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> * Fixed windows build (#85) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add wall blocking vision of ai (#83) * Feat/fireball and alpha on texture (#86) * feat: add wall blocking vision of ai * feat: add aplha channel for texture * Feat/graph assets impl (#88) * moved assets directory * Added texture mirror + player running animation * Ajusted player boundaries * Increased corridors width to fit player new size Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/classes assets impl (#89) * Added shooter asset + added class asset path to database * Added soldier graph asset * Added sorcerer graph asset * reorganized animation asset folders * reorganized animation asset folders Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * [ADD] Mapping Basic (#87) * [ADD] Mapping Basic * [ADD] crash but few features for HUD * [ADD] SpellAssign without crash * Feat/background (#90) * Added background texture Removed wall textures * changed ugly spawn room floor texture Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/boss asset impl (#91) * Boss graphical asset implementation * Added door texture * fixed crash upon boss death Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/classes spell (#93) * feat: Add classes spells * fix: compilation * feat: Support for 4 potential spells * fix: Display piercing_arrow and sword_attack * feat: Bind spell according to GDD fix: Movement velocity with controller v1 (to improve) * feat: add spells animation + sound * fix: update shooter attack spritesheet * fix: update classes.json * feat: change ui (#92) * fixed windows build (#94) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fix/movements (#95) * Clean player movements * Moved camera update code Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fixed crash upon multiple enemy kill at once (#96) added boss spells Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Backup/alpha build (#97) * Fixed crash upon multiple enemy kill at once added boss spells * Adjusted a million things fixed occasional crash during combat Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * bump version v0.3.0 Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr>
Mathieu-Lala
added a commit
that referenced
this pull request
Nov 19, 2020
* init: proto state of art (imgui/glfw/glew/glm) chore: initialize cmake+conan , sanitizers target: app + engine feature: imgui demo window + glfw print events * feat: add handling of event * fix: build VS Release mode (Debug still broken) * chore: set fmt/spdlog header only; feat: add record events to json * feat: add hello triangle opengl * feat: add resize/move; fix: replay event * chore: add CI github * hotfix: matrix.arch * fix: pipeline hello world * hotfix: typos * chore: CI small conan * hotfix: typos * hotfix: typos * chore: CI add conan build * chore: add generate tools script used in pipeline * chore: add install script * hotfix: path * hotfix: path * hotfix: path * hotfix: typos * hotfix: path * hotfix: path * hotfix: path * hotfix: path * hotfix: compiler version override * hotfix: compiler package * chore: conditional stdlib + full conanfile * chore: add conan sys require enabled * chore: add build on pipeline * hotfix: path * hotfix: path * chore: complet cmake env * chore: set new profile conan * fix: compiler version * hotfix: compiler version * hotfix: compiler version * hotfix: compiler version * fix: version compiler * chore: suppress warn on error, explicit opengl * chore: add pkg-config * hotfix: add gl dump * hotfix: add gl dump * hotfix: add gl dump * fix: pipeline v1 working * refact: window class lighter, moved content in core * feat: add joysticks handling * refact: bump v0.1.5 * feat: add display debut joystick * hotfix: build windows + controller buttons windows * feat: add texture * Update joysticks management (#3) * feat: refact joystick management + record joystick event * hotfix: include vector * hotfix: it.base() * Camera + shader improvement (#4) * Added camera system + Improved shader handling * Extracted `draw` method from compononent to system Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat map gen (#5) * Simple Tilemap map builder + Tile factories * Tile fusion to limit entity count * Dungeon generation v1.0 * Added corridor width as parameters Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fullscreen (#6) * feat: add fullscreen / args flag / refact singleton core * chore: update pipeline add release mode; simplified event core * hotfix: pipeline build type * hotfix: update pipeline build type * chore: docopt set shared * chore: pipeline add step launch * hotfix: ls * hotfix: add printf in script * hotfix: pipeline backslash * hotfix: pipeline arch * chore: pipeline fix build folder * chore: pipeline fix build folder * hotfix: update build dir * chore: mindows change ouput path * chore: windows change ouput path * hotfix: set reset output path & docopt static * dump version v0.1.10 * fix: add fullscreen / send event to Game * Fix/warning (#8) * refact: cleanup * fix: bump version 0.1.12 * A few documentation of the project (#11) * doc: adding state_of_art * doc: add structure * doc: add mvp + ui * doc: update mvp alpha / delivery * Big changes (#12) * chore: upgrade imgui/conan version, style: cleanup * chore: add warning pop * hotfix: cast * hotfix: cast * hotfix: msvc warning * chore: remove docopt use cli11 * refact: split main in 2 files; chore: add engine version * Doc: Move GDD in doc folder (#13) * [ADD] 1 page GDD * [ADD] GDD 10 page * doc: move gdd in doc folder * doc: remove old gdd files Co-authored-by: Pierre-Genest <pg.e@outlook.fr> * Refactor component (drawable / position / scale) & Change camera / coordinates system (#14) * feat: moving square; new camera * refact: add Position/Velocity/Scale component, feat: add display mode; refact: camera & shaders * fix: include path * doc: add screenshot * fix: windows build error * refact: split components in different files; doc: add comments * doc: update README; add CI template; conan graph (#15) * Add collision & acceleration / Cleaning shaders / Adding first "enemies" (#18) * feat: add basics pursue AI * feat: cleaner camera movement; shader grid; add hitbox component * feat: add collision * feat: add enemy attack and player health (#20) * Fix/map gen (#17) * Fixed reccurent crash on map generation * Fixed warnings * fixed warning * Attempt to fix warning on linux * warning fix on linux build * linux warning fix attempt Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/signals (#23) * Init competences Test signals * Create player and movement files * Player movement with signals Remove unused files * Rename Movement.hpp -> GameLogic.hpp Create a signal call for game logic * doc: update README / issue_template; chore: add ignore branch tmp/doc (#24) * doc: update README / Issue_template; chore: add ignore branch tmp/doc * chore: fix pipeline on pull request * Feat/map gen entities (#22) * Fixed reccurent crash on map generation * map generation debug window * Restored camera2d and improved its api * Changed objects displayed size * Dungeon terrain despawn * Fixed dungeon tiles transforms * Fixed camera2d projection computation * de-commented enemy spawn re-commented level entity optimisation that causes issue * Changed player color * Basic enemy spawning logic * Enemy and player spawn in dungeon. Z coord handling attempt. still WIP. * simplified player teleportation code * Proper and clean Z-coordinate handle * removed unused variable in shader Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * doc: update readme with badge (#27) * bump: version 0.2.0 * Refact/compile time (#29) * refact: rename files / use forward decl; adding namespace & formatting * refact: remove useless comment * added needed include for windows build (#30) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fight v2 (#31) * feat: add enemy & player attack, instead of range of damage * feat: add user cast spell + kill enemy + xp * fix: msvc warnings * DIfferenciated floor type + some map gen bug fixes (#34) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add state loading/ingame/gameover (#35) * Fixed #36 (#37) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline only on PR * fix: pipeline only on Push * fix: pipeline + add cache conan (#40) * Feat/exit door (#38) * Exit door generation * Improve dungeon seed gestion + added Spam regenerate button on debug GUI * Changed dungeon seed type back to unsigned int due to warnings * moved floor generation process to a fonction * Fixed wrong corridor size issue Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline remove step conan cache * re-added tile fusion feature to improve perf (#43) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * refact: shader in core; feat: add color changement; perf: 60fps (#42) * refact: shader in core; feat: add color changement; perf: 60fps Co-authored-by: Yanis-F <yanis.fourel@gmail.com> * Feat/hud2.0 (#41) * [ADD] non dynamic HUD * [FIX] crash but no boss implementation yet * [Fix] compilation linux * [Add] enemy boss modif * [FIX] compilation linuxx * [Fix] conflict merge Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * texture implementation (#44) * refact: shader in core; feat: add color changement; perf: 60fps * feat: add texture as component * Feat/audio (#45) * Basic soud playing system * Fixed audio loading * Improved Sound api * Added audio file caching * fixed warning * fixed typo in conan cmake config * Restore windows full fullscreen by default * editted obsolete doc comment * fix: warning unix + add imgui+fmt helper + feat: collision+velocity smoother (bugged) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Made boss spawn + fixed boss display (#48) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/boss (#49) * [ADD] Dropping key under the map and boss with 1HP to test leveling and drop * [ADD] drop key + Hud change * [FIX] Destroying boss when restarting level * [FIX] Destroying key when restarting level * [ADD] Boss pursiut * [FIX] Boss Hp to normal * [FIX] linux build * [Modif] add tag enemy to Boss Co-authored-by: Pierre-Genest <pge@outlook.fr> * feat: add spritesheet component and gif animation (#50) * feat: add spritesheet component and gif animation * doc: update screenshot/conan grph/version * fix: msvc contexpr virtual function not supported * Feat/level transition (#51) * Key pickup * onNextLevel event + Door interraction * fix: build linux Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Added basic audio assets (#52) * Added basic audio assets + improved audio API * Added deaths sounds Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/json data (#53) * feat: Create player / class from json * fix: creation of player and class with json * fix: reorganize header * fix: newline at end of files * other: remove comments * fix: build linux * bump: version 0.2.17 Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Lint + better data folder management (#54) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * Feat/settings (#55) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * add: data_folder in app.ini * fix: msvc warning * fix: crash singleton in .data * fix: warning release mode * Fixed crashed if no available audio device was available (#56) * Fixed crashed if no available audio device was available * Fixed audio not working * chore: remove launch ubuntu from pipeline Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/fireball (#57) * feat: add fireball (bugged) * Fixed audio not working (#58) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/animation (#59) * feat: add severals animations in json spritesheet * fix: warning msvc * fix: focus bug * Feat/screenshake (#60) * feat: add screenshake v1 * chore: add args on script tools * hotfix: msvc warning * hotfix: msvc warning * Feat/spells management (#62) * + Spell database + Spellslots system for enemies * Added spell slots to player * Made classes spells configurable * refact: same feature but simplier Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/joystick movement (#64) * feat: Add player movement with controller * other: update version * fix: Fix compilation * Feat/debug console (#63) * tmp fix of ImGui keyboard events * Extracted ImGui console to separate class * Basic command system * Basic command autocompletion system * First command : Kill * xp commands * final touches + set music volume * chore: add launch to pipeline; fix optional include * fix: pipeline & include * fix: pipeline * chore: commenting pipeline * Update Core.hpp Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Test/init suite (#65) * tests: add coverage (bugged) * fix: exclude correctly system and conan files Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Test/golden (#66) * tests: add coverage (bugged) * fix: exclude correctly system and conan files * feat: add screenshot * Refact/design core (#67) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * Feat/player class switch (#68) * Class database + buy class event * remove "name" field in class config * Added children class * Class config : children are now class names * buyClass commands now takes class name * Added setSpell command + fixed console not clearing on command * Player knows which class he bought * Fixed unix warning * Added icon to classes * fix unix warning Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * fixed wrong class db path (#71) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/camera player movement (#75) * feat: Add attacks on controller * feat: update camera * fix: fix compilation * fix: update camera viewport * fix: controller attack buttons * Feat/hud3.0 (#74) * [ADD] some visual for HUD * Added skill point system * [ADD] HUD3.0 added * [FIX] Linux compilation * [fix] Linux Compilation fix * [fix] Linux Compilation fix * [fix] Linux Compilation fix Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/particule (#72) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * feat: add simple particule system * hotfix: .hpp -> .cpp * hotfix: .hpp -> .cpp * revert: develop db data Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> * Added rotation (#73) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * current HP change according to changes to max hp (#80) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/better collisions (#78) * Fixed crash if spell hit multiple walls at once * Actual good keyboard player movements. Debug only * Better collisions * Fixed collision bug that allows moving entity to overlap Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Fixed #77 : added attribute "starter" to class database (#79) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/doc and test (#81) * doc: updated * fix: console completion * Chore/more ci (#82) * tests: add fuzz + travis * chore: add build and coverage to travis * chore: fix test * chore: add codecov token * assets modif (#84) Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> * Fixed windows build (#85) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add wall blocking vision of ai (#83) * Feat/fireball and alpha on texture (#86) * feat: add wall blocking vision of ai * feat: add aplha channel for texture * Feat/graph assets impl (#88) * moved assets directory * Added texture mirror + player running animation * Ajusted player boundaries * Increased corridors width to fit player new size Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/classes assets impl (#89) * Added shooter asset + added class asset path to database * Added soldier graph asset * Added sorcerer graph asset * reorganized animation asset folders * reorganized animation asset folders Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * [ADD] Mapping Basic (#87) * [ADD] Mapping Basic * [ADD] crash but few features for HUD * [ADD] SpellAssign without crash * Feat/background (#90) * Added background texture Removed wall textures * changed ugly spawn room floor texture Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/boss asset impl (#91) * Boss graphical asset implementation * Added door texture * fixed crash upon boss death Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/classes spell (#93) * feat: Add classes spells * fix: compilation * feat: Support for 4 potential spells * fix: Display piercing_arrow and sword_attack * feat: Bind spell according to GDD fix: Movement velocity with controller v1 (to improve) * feat: add spells animation + sound * fix: update shooter attack spritesheet * fix: update classes.json * feat: change ui (#92) * fixed windows build (#94) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fix/movements (#95) * Clean player movements * Moved camera update code Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fixed crash upon multiple enemy kill at once (#96) added boss spells Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Backup/alpha build (#97) * Fixed crash upon multiple enemy kill at once added boss spells * Adjusted a million things fixed occasional crash during combat Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * bump version v0.3.0 Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr>
yanis-fourel
added a commit
that referenced
this pull request
Dec 15, 2020
* Bump 0.3.0 (#100) (#101) * init: proto state of art (imgui/glfw/glew/glm) chore: initialize cmake+conan , sanitizers target: app + engine feature: imgui demo window + glfw print events * feat: add handling of event * fix: build VS Release mode (Debug still broken) * chore: set fmt/spdlog header only; feat: add record events to json * feat: add hello triangle opengl * feat: add resize/move; fix: replay event * chore: add CI github * hotfix: matrix.arch * fix: pipeline hello world * hotfix: typos * chore: CI small conan * hotfix: typos * hotfix: typos * chore: CI add conan build * chore: add generate tools script used in pipeline * chore: add install script * hotfix: path * hotfix: path * hotfix: path * hotfix: typos * hotfix: path * hotfix: path * hotfix: path * hotfix: path * hotfix: compiler version override * hotfix: compiler package * chore: conditional stdlib + full conanfile * chore: add conan sys require enabled * chore: add build on pipeline * hotfix: path * hotfix: path * chore: complet cmake env * chore: set new profile conan * fix: compiler version * hotfix: compiler version * hotfix: compiler version * hotfix: compiler version * fix: version compiler * chore: suppress warn on error, explicit opengl * chore: add pkg-config * hotfix: add gl dump * hotfix: add gl dump * hotfix: add gl dump * fix: pipeline v1 working * refact: window class lighter, moved content in core * feat: add joysticks handling * refact: bump v0.1.5 * feat: add display debut joystick * hotfix: build windows + controller buttons windows * feat: add texture * Update joysticks management (#3) * feat: refact joystick management + record joystick event * hotfix: include vector * hotfix: it.base() * Camera + shader improvement (#4) * Added camera system + Improved shader handling * Extracted `draw` method from compononent to system Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat map gen (#5) * Simple Tilemap map builder + Tile factories * Tile fusion to limit entity count * Dungeon generation v1.0 * Added corridor width as parameters Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fullscreen (#6) * feat: add fullscreen / args flag / refact singleton core * chore: update pipeline add release mode; simplified event core * hotfix: pipeline build type * hotfix: update pipeline build type * chore: docopt set shared * chore: pipeline add step launch * hotfix: ls * hotfix: add printf in script * hotfix: pipeline backslash * hotfix: pipeline arch * chore: pipeline fix build folder * chore: pipeline fix build folder * hotfix: update build dir * chore: mindows change ouput path * chore: windows change ouput path * hotfix: set reset output path & docopt static * dump version v0.1.10 * fix: add fullscreen / send event to Game * Fix/warning (#8) * refact: cleanup * fix: bump version 0.1.12 * A few documentation of the project (#11) * doc: adding state_of_art * doc: add structure * doc: add mvp + ui * doc: update mvp alpha / delivery * Big changes (#12) * chore: upgrade imgui/conan version, style: cleanup * chore: add warning pop * hotfix: cast * hotfix: cast * hotfix: msvc warning * chore: remove docopt use cli11 * refact: split main in 2 files; chore: add engine version * Doc: Move GDD in doc folder (#13) * [ADD] 1 page GDD * [ADD] GDD 10 page * doc: move gdd in doc folder * doc: remove old gdd files Co-authored-by: Pierre-Genest <pg.e@outlook.fr> * Refactor component (drawable / position / scale) & Change camera / coordinates system (#14) * feat: moving square; new camera * refact: add Position/Velocity/Scale component, feat: add display mode; refact: camera & shaders * fix: include path * doc: add screenshot * fix: windows build error * refact: split components in different files; doc: add comments * doc: update README; add CI template; conan graph (#15) * Add collision & acceleration / Cleaning shaders / Adding first "enemies" (#18) * feat: add basics pursue AI * feat: cleaner camera movement; shader grid; add hitbox component * feat: add collision * feat: add enemy attack and player health (#20) * Fix/map gen (#17) * Fixed reccurent crash on map generation * Fixed warnings * fixed warning * Attempt to fix warning on linux * warning fix on linux build * linux warning fix attempt Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/signals (#23) * Init competences Test signals * Create player and movement files * Player movement with signals Remove unused files * Rename Movement.hpp -> GameLogic.hpp Create a signal call for game logic * doc: update README / issue_template; chore: add ignore branch tmp/doc (#24) * doc: update README / Issue_template; chore: add ignore branch tmp/doc * chore: fix pipeline on pull request * Feat/map gen entities (#22) * Fixed reccurent crash on map generation * map generation debug window * Restored camera2d and improved its api * Changed objects displayed size * Dungeon terrain despawn * Fixed dungeon tiles transforms * Fixed camera2d projection computation * de-commented enemy spawn re-commented level entity optimisation that causes issue * Changed player color * Basic enemy spawning logic * Enemy and player spawn in dungeon. Z coord handling attempt. still WIP. * simplified player teleportation code * Proper and clean Z-coordinate handle * removed unused variable in shader Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * doc: update readme with badge (#27) * bump: version 0.2.0 * Refact/compile time (#29) * refact: rename files / use forward decl; adding namespace & formatting * refact: remove useless comment * added needed include for windows build (#30) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fight v2 (#31) * feat: add enemy & player attack, instead of range of damage * feat: add user cast spell + kill enemy + xp * fix: msvc warnings * DIfferenciated floor type + some map gen bug fixes (#34) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add state loading/ingame/gameover (#35) * Fixed #36 (#37) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline only on PR * fix: pipeline only on Push * fix: pipeline + add cache conan (#40) * Feat/exit door (#38) * Exit door generation * Improve dungeon seed gestion + added Spam regenerate button on debug GUI * Changed dungeon seed type back to unsigned int due to warnings * moved floor generation process to a fonction * Fixed wrong corridor size issue Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline remove step conan cache * re-added tile fusion feature to improve perf (#43) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * refact: shader in core; feat: add color changement; perf: 60fps (#42) * refact: shader in core; feat: add color changement; perf: 60fps Co-authored-by: Yanis-F <yanis.fourel@gmail.com> * Feat/hud2.0 (#41) * [ADD] non dynamic HUD * [FIX] crash but no boss implementation yet * [Fix] compilation linux * [Add] enemy boss modif * [FIX] compilation linuxx * [Fix] conflict merge Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * texture implementation (#44) * refact: shader in core; feat: add color changement; perf: 60fps * feat: add texture as component * Feat/audio (#45) * Basic soud playing system * Fixed audio loading * Improved Sound api * Added audio file caching * fixed warning * fixed typo in conan cmake config * Restore windows full fullscreen by default * editted obsolete doc comment * fix: warning unix + add imgui+fmt helper + feat: collision+velocity smoother (bugged) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Made boss spawn + fixed boss display (#48) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/boss (#49) * [ADD] Dropping key under the map and boss with 1HP to test leveling and drop * [ADD] drop key + Hud change * [FIX] Destroying boss when restarting level * [FIX] Destroying key when restarting level * [ADD] Boss pursiut * [FIX] Boss Hp to normal * [FIX] linux build * [Modif] add tag enemy to Boss Co-authored-by: Pierre-Genest <pge@outlook.fr> * feat: add spritesheet component and gif animation (#50) * feat: add spritesheet component and gif animation * doc: update screenshot/conan grph/version * fix: msvc contexpr virtual function not supported * Feat/level transition (#51) * Key pickup * onNextLevel event + Door interraction * fix: build linux Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Added basic audio assets (#52) * Added basic audio assets + improved audio API * Added deaths sounds Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/json data (#53) * feat: Create player / class from json * fix: creation of player and class with json * fix: reorganize header * fix: newline at end of files * other: remove comments * fix: build linux * bump: version 0.2.17 Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Lint + better data folder management (#54) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * Feat/settings (#55) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * add: data_folder in app.ini * fix: msvc warning * fix: crash singleton in .data * fix: warning release mode * Fixed crashed if no available audio device was available (#56) * Fixed crashed if no available audio device was available * Fixed audio not working * chore: remove launch ubuntu from pipeline Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/fireball (#57) * feat: add fireball (bugged) * Fixed audio not working (#58) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/animation (#59) * feat: add severals animations in json spritesheet * fix: warning msvc * fix: focus bug * Feat/screenshake (#60) * feat: add screenshake v1 * chore: add args on script tools * hotfix: msvc warning * hotfix: msvc warning * Feat/spells management (#62) * + Spell database + Spellslots system for enemies * Added spell slots to player * Made classes spells configurable * refact: same feature but simplier Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/joystick movement (#64) * feat: Add player movement with controller * other: update version * fix: Fix compilation * Feat/debug console (#63) * tmp fix of ImGui keyboard events * Extracted ImGui console to separate class * Basic command system * Basic command autocompletion system * First command : Kill * xp commands * final touches + set music volume * chore: add launch to pipeline; fix optional include * fix: pipeline & include * fix: pipeline * chore: commenting pipeline * Update Core.hpp Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Test/init suite (#65) * tests: add coverage (bugged) * fix: exclude correctly system and conan files Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Test/golden (#66) * tests: add coverage (bugged) * fix: exclude correctly system and conan files * feat: add screenshot * Refact/design core (#67) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * Feat/player class switch (#68) * Class database + buy class event * remove "name" field in class config * Added children class * Class config : children are now class names * buyClass commands now takes class name * Added setSpell command + fixed console not clearing on command * Player knows which class he bought * Fixed unix warning * Added icon to classes * fix unix warning Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * fixed wrong class db path (#71) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/camera player movement (#75) * feat: Add attacks on controller * feat: update camera * fix: fix compilation * fix: update camera viewport * fix: controller attack buttons * Feat/hud3.0 (#74) * [ADD] some visual for HUD * Added skill point system * [ADD] HUD3.0 added * [FIX] Linux compilation * [fix] Linux Compilation fix * [fix] Linux Compilation fix * [fix] Linux Compilation fix Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/particule (#72) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * feat: add simple particule system * hotfix: .hpp -> .cpp * hotfix: .hpp -> .cpp * revert: develop db data Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> * Added rotation (#73) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * current HP change according to changes to max hp (#80) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/better collisions (#78) * Fixed crash if spell hit multiple walls at once * Actual good keyboard player movements. Debug only * Better collisions * Fixed collision bug that allows moving entity to overlap Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Fixed #77 : added attribute "starter" to class database (#79) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/doc and test (#81) * doc: updated * fix: console completion * Chore/more ci (#82) * tests: add fuzz + travis * chore: add build and coverage to travis * chore: fix test * chore: add codecov token * assets modif (#84) Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> * Fixed windows build (#85) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add wall blocking vision of ai (#83) * Feat/fireball and alpha on texture (#86) * feat: add wall blocking vision of ai * feat: add aplha channel for texture * Feat/graph assets impl (#88) * moved assets directory * Added texture mirror + player running animation * Ajusted player boundaries * Increased corridors width to fit player new size Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/classes assets impl (#89) * Added shooter asset + added class asset path to database * Added soldier graph asset * Added sorcerer graph asset * reorganized animation asset folders * reorganized animation asset folders Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * [ADD] Mapping Basic (#87) * [ADD] Mapping Basic * [ADD] crash but few features for HUD * [ADD] SpellAssign without crash * Feat/background (#90) * Added background texture Removed wall textures * changed ugly spawn room floor texture Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/boss asset impl (#91) * Boss graphical asset implementation * Added door texture * fixed crash upon boss death Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/classes spell (#93) * feat: Add classes spells * fix: compilation * feat: Support for 4 potential spells * fix: Display piercing_arrow and sword_attack * feat: Bind spell according to GDD fix: Movement velocity with controller v1 (to improve) * feat: add spells animation + sound * fix: update shooter attack spritesheet * fix: update classes.json * feat: change ui (#92) * fixed windows build (#94) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fix/movements (#95) * Clean player movements * Moved camera update code Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fixed crash upon multiple enemy kill at once (#96) added boss spells Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Backup/alpha build (#97) * Fixed crash upon multiple enemy kill at once added boss spells * Adjusted a million things fixed occasional crash during combat Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * bump version v0.3.0 Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> * Player aiming (#104) Player aiming with Right stick Added deadzone to joysticks Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * fixed (#105) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Revision/v0.3 (#103) * chore: glfw_imgui_impl include dir * perf: spritesheet texture is loaded once * update signal/slots name * style: format * fix: keyboard movement * Fixed windows build (#106) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Menus refacto (#107) * refacto: Replaced game state by game current menu * ThePURGE class cleanup * Re-implemented old menus Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: animation with severals files / skeleton (#111) * Allow enetity with no rotation to be displayed (#110) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Refact/review (#115) * chore: update install script and remove unused assets * feat: add death animation * fix: install * Feat/t2 classes (#114) * feat: Add T2 classes in classes.json * feat: move speed and hitbox in classes.json * feat: maxhp work now like an hp bonus * fix: call movement * fix: update joystick movement with speed * fix: apply changes after feedback * fix: apply changes after feedback * feat: add class cost * feat: use class cost in the shop fix: -1 skill point at start Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Clean up before big features (#118) * clean classes, broken upgrade panel * refact: spells db * refact: level -> stage; simplified api * fix: add purchase board back * Feat/main menu v2 (#119) * Main menu background + texture helpers * Menu inputs adjustments * Main menu buttons * Credits menu * How to play menu + improved menu utils + renamed rules to howtoplay * Fixed credit menu close input * Added menu navigation sound * Added main menu music + balanced menu sound volume * exit howtoplay menu with A controller button as well * cleaned cmakelists * Fixed merge * Added gimp project files Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/spell v4 (#120) * feat: using spells.json, spell id is string and not enum * feat: same feature as before * resolve merge * Feat/particles (#117) * [ADD] Basic particules * [ADD] Basic particules * [ADD] PARTICULES POSITIVE AND NEUTRAL * [MERGE] For push Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * feat: enemy json (#121) * feat: enemy json * tweak: data * Feat/spell v5 (#123) * refact: simplied menu upgrade; add icon; add type on spell * feat: add mage spell * Added class and spells icon to prepare for hte new HUD (#126) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/hud rework (#127) * Extracted AMenu draw helpers to expose it to HUD drawer * HUD background * added health bar * Add XP bar * Added spells * Fixed spell display order + cleanup * Added texts + upgrade icon with skillpoints * Removed old debug code ㅠㅠ Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Made keyboard movement inputs viable (#128) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Preparation Feat/spell v5 (#129) * refact: simplied menu upgrade; add icon; add type on spell * feat: add mage spell * feat: pause * feat: add speed on enemies * Feat/enemies (#130) * [ADD] zombie * [ADD] GOlem + summoners+ zombie * [ADD] Zombie Death + direction spell * [Modif] golem attack * feat: add new sprites (#131) Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/spell v6 (#132) * feat: add functional effect & firewall * feat: add warrior spell * merge develop * Feat/upgrade panel rework (#133) * Hide cursor in game * Upgrade panel textures * Portrait + spell detail * Stat display. Barely tested * Added buy button * Classes tree parsing * Added isOwned and isPurchaseable helpers * Tree display * Tree navigation inputs * Fixed invisible cursor when showing debug info * baisc class buying system * Spell assignment * Fixed purchase of owned classes * Y to buy heal * added sounds * last adjustments * Removed unneeded nebug * Added missing descriptions to spells Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/spell v7 (#134) * fix: double speed in entity factory * feat: add slow effect / tank spell / ice/fire skeletong * Feat/game over menu (#135) * basic game over menu * Added game time to game over menu * Added enemy killed Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Review/v0.3.16 (#136) * fix * feat: sound and effect * fix imgui path downloaded file * Feat/ennemies (#137) * [ADD] Attack in json and spawn with level * [DELETE] temp file * [ADD] Leveling * Fix/issue #140 upgradepanel crash (#141) * Fixed bug causing to not be able to move current selection left on the upgrade panel tree * Fixed ImGui path in cmakelists Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fix/effect (#144) * fix: update joystick event * fix: elpased time a boolean flip * fix: add spell target * fix * Fixed deltatime misscalculation (#142) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Capped deltatime at 50ms (#143) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * add more spell :) (#145) * Fix/ennemies asset (#146) * [Fix] ASSETS OF ZOMBIE + SUMMONERS(CASTER) + GOLEM * [ADD] golem turret * [ADD] Boss PILACHU * [Modif] New boss speed and attack Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/mirrored repeated (#149) * feat: add mirrored repeated texture (breaking changes) * fix: cash, delete deprecated texture * fix: repeated and add map texture Co-authored-by: Yanis-F <yanis.fourel@gmail.com> * Fixed bug causin aiming sight to remaining floating on the map after respawn (#148) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/attack animation (#150) * fix: fix spritesheet path for death * feat: add animation sprite for each classes * feat: add new classes icon * feat: Change spells desciption Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> * Feat/all spell t2 (#152) * feat: add barrel broken, fix texture shovel, add rock (no tag wall) * fix: barrel don t segfault * fix: some bugs (still crashes) * feat: add explosion bugged on barrel destroy * feat: add spells icons (#153) * feat: add barrel * doc: update doc * Feat/barrel & Fix some bugs (#154) * fix: some bugs (still crashes) * feat: add explosion bugged on barrel destroy * feat: add barrel * doc: update doc * feat: implement icons in json * Feat/misc sounds (#155) * fixed build * Added level up sound * Added key pickup sound Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/game balance (#158) * feat: balance hp and spd for the classes * feat: change ennemies value * Doc/readme update (#159) * doc: update readme * fix: pipeline on PR * Feat/keyboard binds rework (#160) * Fixed errors in spell descriptions * Reworked keyboard binds to be intuitive * Fixed keyboard movement when releasing and pressing keys controlling same axis during the same frame * Added keyboard controls to howtoplay menu Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * [ADD] skeleton anim (#157) * [ADD] skeleton anim * [MERGE] FIX * [MERGE] Fix in spellfactory entity health Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * tweak (#161) * [Modif] change balance of classes and spells (#162) * bump: v0.4.0 Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr>
yanis-fourel
added a commit
that referenced
this pull request
Dec 16, 2020
* Bump 0.3.0 (#100) (#101) * init: proto state of art (imgui/glfw/glew/glm) chore: initialize cmake+conan , sanitizers target: app + engine feature: imgui demo window + glfw print events * feat: add handling of event * fix: build VS Release mode (Debug still broken) * chore: set fmt/spdlog header only; feat: add record events to json * feat: add hello triangle opengl * feat: add resize/move; fix: replay event * chore: add CI github * hotfix: matrix.arch * fix: pipeline hello world * hotfix: typos * chore: CI small conan * hotfix: typos * hotfix: typos * chore: CI add conan build * chore: add generate tools script used in pipeline * chore: add install script * hotfix: path * hotfix: path * hotfix: path * hotfix: typos * hotfix: path * hotfix: path * hotfix: path * hotfix: path * hotfix: compiler version override * hotfix: compiler package * chore: conditional stdlib + full conanfile * chore: add conan sys require enabled * chore: add build on pipeline * hotfix: path * hotfix: path * chore: complet cmake env * chore: set new profile conan * fix: compiler version * hotfix: compiler version * hotfix: compiler version * hotfix: compiler version * fix: version compiler * chore: suppress warn on error, explicit opengl * chore: add pkg-config * hotfix: add gl dump * hotfix: add gl dump * hotfix: add gl dump * fix: pipeline v1 working * refact: window class lighter, moved content in core * feat: add joysticks handling * refact: bump v0.1.5 * feat: add display debut joystick * hotfix: build windows + controller buttons windows * feat: add texture * Update joysticks management (#3) * feat: refact joystick management + record joystick event * hotfix: include vector * hotfix: it.base() * Camera + shader improvement (#4) * Added camera system + Improved shader handling * Extracted `draw` method from compononent to system Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat map gen (#5) * Simple Tilemap map builder + Tile factories * Tile fusion to limit entity count * Dungeon generation v1.0 * Added corridor width as parameters Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fullscreen (#6) * feat: add fullscreen / args flag / refact singleton core * chore: update pipeline add release mode; simplified event core * hotfix: pipeline build type * hotfix: update pipeline build type * chore: docopt set shared * chore: pipeline add step launch * hotfix: ls * hotfix: add printf in script * hotfix: pipeline backslash * hotfix: pipeline arch * chore: pipeline fix build folder * chore: pipeline fix build folder * hotfix: update build dir * chore: mindows change ouput path * chore: windows change ouput path * hotfix: set reset output path & docopt static * dump version v0.1.10 * fix: add fullscreen / send event to Game * Fix/warning (#8) * refact: cleanup * fix: bump version 0.1.12 * A few documentation of the project (#11) * doc: adding state_of_art * doc: add structure * doc: add mvp + ui * doc: update mvp alpha / delivery * Big changes (#12) * chore: upgrade imgui/conan version, style: cleanup * chore: add warning pop * hotfix: cast * hotfix: cast * hotfix: msvc warning * chore: remove docopt use cli11 * refact: split main in 2 files; chore: add engine version * Doc: Move GDD in doc folder (#13) * [ADD] 1 page GDD * [ADD] GDD 10 page * doc: move gdd in doc folder * doc: remove old gdd files Co-authored-by: Pierre-Genest <pg.e@outlook.fr> * Refactor component (drawable / position / scale) & Change camera / coordinates system (#14) * feat: moving square; new camera * refact: add Position/Velocity/Scale component, feat: add display mode; refact: camera & shaders * fix: include path * doc: add screenshot * fix: windows build error * refact: split components in different files; doc: add comments * doc: update README; add CI template; conan graph (#15) * Add collision & acceleration / Cleaning shaders / Adding first "enemies" (#18) * feat: add basics pursue AI * feat: cleaner camera movement; shader grid; add hitbox component * feat: add collision * feat: add enemy attack and player health (#20) * Fix/map gen (#17) * Fixed reccurent crash on map generation * Fixed warnings * fixed warning * Attempt to fix warning on linux * warning fix on linux build * linux warning fix attempt Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/signals (#23) * Init competences Test signals * Create player and movement files * Player movement with signals Remove unused files * Rename Movement.hpp -> GameLogic.hpp Create a signal call for game logic * doc: update README / issue_template; chore: add ignore branch tmp/doc (#24) * doc: update README / Issue_template; chore: add ignore branch tmp/doc * chore: fix pipeline on pull request * Feat/map gen entities (#22) * Fixed reccurent crash on map generation * map generation debug window * Restored camera2d and improved its api * Changed objects displayed size * Dungeon terrain despawn * Fixed dungeon tiles transforms * Fixed camera2d projection computation * de-commented enemy spawn re-commented level entity optimisation that causes issue * Changed player color * Basic enemy spawning logic * Enemy and player spawn in dungeon. Z coord handling attempt. still WIP. * simplified player teleportation code * Proper and clean Z-coordinate handle * removed unused variable in shader Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * doc: update readme with badge (#27) * bump: version 0.2.0 * Refact/compile time (#29) * refact: rename files / use forward decl; adding namespace & formatting * refact: remove useless comment * added needed include for windows build (#30) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/fight v2 (#31) * feat: add enemy & player attack, instead of range of damage * feat: add user cast spell + kill enemy + xp * fix: msvc warnings * DIfferenciated floor type + some map gen bug fixes (#34) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add state loading/ingame/gameover (#35) * Fixed #36 (#37) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline only on PR * fix: pipeline only on Push * fix: pipeline + add cache conan (#40) * Feat/exit door (#38) * Exit door generation * Improve dungeon seed gestion + added Spam regenerate button on debug GUI * Changed dungeon seed type back to unsigned int due to warnings * moved floor generation process to a fonction * Fixed wrong corridor size issue Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * fix: pipeline remove step conan cache * re-added tile fusion feature to improve perf (#43) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * refact: shader in core; feat: add color changement; perf: 60fps (#42) * refact: shader in core; feat: add color changement; perf: 60fps Co-authored-by: Yanis-F <yanis.fourel@gmail.com> * Feat/hud2.0 (#41) * [ADD] non dynamic HUD * [FIX] crash but no boss implementation yet * [Fix] compilation linux * [Add] enemy boss modif * [FIX] compilation linuxx * [Fix] conflict merge Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * texture implementation (#44) * refact: shader in core; feat: add color changement; perf: 60fps * feat: add texture as component * Feat/audio (#45) * Basic soud playing system * Fixed audio loading * Improved Sound api * Added audio file caching * fixed warning * fixed typo in conan cmake config * Restore windows full fullscreen by default * editted obsolete doc comment * fix: warning unix + add imgui+fmt helper + feat: collision+velocity smoother (bugged) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Made boss spawn + fixed boss display (#48) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/boss (#49) * [ADD] Dropping key under the map and boss with 1HP to test leveling and drop * [ADD] drop key + Hud change * [FIX] Destroying boss when restarting level * [FIX] Destroying key when restarting level * [ADD] Boss pursiut * [FIX] Boss Hp to normal * [FIX] linux build * [Modif] add tag enemy to Boss Co-authored-by: Pierre-Genest <pge@outlook.fr> * feat: add spritesheet component and gif animation (#50) * feat: add spritesheet component and gif animation * doc: update screenshot/conan grph/version * fix: msvc contexpr virtual function not supported * Feat/level transition (#51) * Key pickup * onNextLevel event + Door interraction * fix: build linux Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Added basic audio assets (#52) * Added basic audio assets + improved audio API * Added deaths sounds Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/json data (#53) * feat: Create player / class from json * fix: creation of player and class with json * fix: reorganize header * fix: newline at end of files * other: remove comments * fix: build linux * bump: version 0.2.17 Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Lint + better data folder management (#54) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * Feat/settings (#55) * style: adding cmake-format * chore: add rule copy data in build folder * style: lint & format * doc: add msvc cppcheck ext * add: data_folder in app.ini * fix: msvc warning * fix: crash singleton in .data * fix: warning release mode * Fixed crashed if no available audio device was available (#56) * Fixed crashed if no available audio device was available * Fixed audio not working * chore: remove launch ubuntu from pipeline Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/fireball (#57) * feat: add fireball (bugged) * Fixed audio not working (#58) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/animation (#59) * feat: add severals animations in json spritesheet * fix: warning msvc * fix: focus bug * Feat/screenshake (#60) * feat: add screenshake v1 * chore: add args on script tools * hotfix: msvc warning * hotfix: msvc warning * Feat/spells management (#62) * + Spell database + Spellslots system for enemies * Added spell slots to player * Made classes spells configurable * refact: same feature but simplier Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Feat/joystick movement (#64) * feat: Add player movement with controller * other: update version * fix: Fix compilation * Feat/debug console (#63) * tmp fix of ImGui keyboard events * Extracted ImGui console to separate class * Basic command system * Basic command autocompletion system * First command : Kill * xp commands * final touches + set music volume * chore: add launch to pipeline; fix optional include * fix: pipeline & include * fix: pipeline * chore: commenting pipeline * Update Core.hpp Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu LALA <mathieu.lala@epitech.eu> * Test/init suite (#65) * tests: add coverage (bugged) * fix: exclude correctly system and conan files Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Test/golden (#66) * tests: add coverage (bugged) * fix: exclude correctly system and conan files * feat: add screenshot * Refact/design core (#67) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * Feat/player class switch (#68) * Class database + buy class event * remove "name" field in class config * Added children class * Class config : children are now class names * buyClass commands now takes class name * Added setSpell command + fixed console not clearing on command * Player knows which class he bought * Fixed unix warning * Added icon to classes * fix unix warning Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * fixed wrong class db path (#71) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/camera player movement (#75) * feat: Add attacks on controller * feat: update camera * fix: fix compilation * fix: update camera viewport * fix: controller attack buttons * Feat/hud3.0 (#74) * [ADD] some visual for HUD * Added skill point system * [ADD] HUD3.0 added * [FIX] Linux compilation * [fix] Linux Compilation fix * [fix] Linux Compilation fix * [fix] Linux Compilation fix Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/particule (#72) * refact: move Game in api namespace; chore: create engine_main, -d as debug prefix * fix: remove old comment; fix: pending note * feat: add simple particule system * hotfix: .hpp -> .cpp * hotfix: .hpp -> .cpp * revert: develop db data Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> * Added rotation (#73) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * current HP change according to changes to max hp (#80) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/better collisions (#78) * Fixed crash if spell hit multiple walls at once * Actual good keyboard player movements. Debug only * Better collisions * Fixed collision bug that allows moving entity to overlap Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Fixed #77 : added attribute "starter" to class database (#79) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/doc and test (#81) * doc: updated * fix: console completion * Chore/more ci (#82) * tests: add fuzz + travis * chore: add build and coverage to travis * chore: fix test * chore: add codecov token * assets modif (#84) Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> * Fixed windows build (#85) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: add wall blocking vision of ai (#83) * Feat/fireball and alpha on texture (#86) * feat: add wall blocking vision of ai * feat: add aplha channel for texture * Feat/graph assets impl (#88) * moved assets directory * Added texture mirror + player running animation * Ajusted player boundaries * Increased corridors width to fit player new size Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/classes assets impl (#89) * Added shooter asset + added class asset path to database * Added soldier graph asset * Added sorcerer graph asset * reorganized animation asset folders * reorganized animation asset folders Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * [ADD] Mapping Basic (#87) * [ADD] Mapping Basic * [ADD] crash but few features for HUD * [ADD] SpellAssign without crash * Feat/background (#90) * Added background texture Removed wall textures * changed ugly spawn room floor texture Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/boss asset impl (#91) * Boss graphical asset implementation * Added door texture * fixed crash upon boss death Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/classes spell (#93) * feat: Add classes spells * fix: compilation * feat: Support for 4 potential spells * fix: Display piercing_arrow and sword_attack * feat: Bind spell according to GDD fix: Movement velocity with controller v1 (to improve) * feat: add spells animation + sound * fix: update shooter attack spritesheet * fix: update classes.json * feat: change ui (#92) * fixed windows build (#94) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fix/movements (#95) * Clean player movements * Moved camera update code Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fixed crash upon multiple enemy kill at once (#96) added boss spells Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Backup/alpha build (#97) * Fixed crash upon multiple enemy kill at once added boss spells * Adjusted a million things fixed occasional crash during combat Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * bump version v0.3.0 Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> * Player aiming (#104) Player aiming with Right stick Added deadzone to joysticks Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * fixed (#105) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Revision/v0.3 (#103) * chore: glfw_imgui_impl include dir * perf: spritesheet texture is loaded once * update signal/slots name * style: format * fix: keyboard movement * Fixed windows build (#106) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Menus refacto (#107) * refacto: Replaced game state by game current menu * ThePURGE class cleanup * Re-implemented old menus Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * feat: animation with severals files / skeleton (#111) * Allow enetity with no rotation to be displayed (#110) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Refact/review (#115) * chore: update install script and remove unused assets * feat: add death animation * fix: install * Feat/t2 classes (#114) * feat: Add T2 classes in classes.json * feat: move speed and hitbox in classes.json * feat: maxhp work now like an hp bonus * fix: call movement * fix: update joystick movement with speed * fix: apply changes after feedback * fix: apply changes after feedback * feat: add class cost * feat: use class cost in the shop fix: -1 skill point at start Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Clean up before big features (#118) * clean classes, broken upgrade panel * refact: spells db * refact: level -> stage; simplified api * fix: add purchase board back * Feat/main menu v2 (#119) * Main menu background + texture helpers * Menu inputs adjustments * Main menu buttons * Credits menu * How to play menu + improved menu utils + renamed rules to howtoplay * Fixed credit menu close input * Added menu navigation sound * Added main menu music + balanced menu sound volume * exit howtoplay menu with A controller button as well * cleaned cmakelists * Fixed merge * Added gimp project files Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/spell v4 (#120) * feat: using spells.json, spell id is string and not enum * feat: same feature as before * resolve merge * Feat/particles (#117) * [ADD] Basic particules * [ADD] Basic particules * [ADD] PARTICULES POSITIVE AND NEUTRAL * [MERGE] For push Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * feat: enemy json (#121) * feat: enemy json * tweak: data * Feat/spell v5 (#123) * refact: simplied menu upgrade; add icon; add type on spell * feat: add mage spell * Added class and spells icon to prepare for hte new HUD (#126) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/hud rework (#127) * Extracted AMenu draw helpers to expose it to HUD drawer * HUD background * added health bar * Add XP bar * Added spells * Fixed spell display order + cleanup * Added texts + upgrade icon with skillpoints * Removed old debug code ㅠㅠ Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Made keyboard movement inputs viable (#128) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Preparation Feat/spell v5 (#129) * refact: simplied menu upgrade; add icon; add type on spell * feat: add mage spell * feat: pause * feat: add speed on enemies * Feat/enemies (#130) * [ADD] zombie * [ADD] GOlem + summoners+ zombie * [ADD] Zombie Death + direction spell * [Modif] golem attack * feat: add new sprites (#131) Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/spell v6 (#132) * feat: add functional effect & firewall * feat: add warrior spell * merge develop * Feat/upgrade panel rework (#133) * Hide cursor in game * Upgrade panel textures * Portrait + spell detail * Stat display. Barely tested * Added buy button * Classes tree parsing * Added isOwned and isPurchaseable helpers * Tree display * Tree navigation inputs * Fixed invisible cursor when showing debug info * baisc class buying system * Spell assignment * Fixed purchase of owned classes * Y to buy heal * added sounds * last adjustments * Removed unneeded nebug * Added missing descriptions to spells Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Feat/spell v7 (#134) * fix: double speed in entity factory * feat: add slow effect / tank spell / ice/fire skeletong * Feat/game over menu (#135) * basic game over menu * Added game time to game over menu * Added enemy killed Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Review/v0.3.16 (#136) * fix * feat: sound and effect * fix imgui path downloaded file * Feat/ennemies (#137) * [ADD] Attack in json and spawn with level * [DELETE] temp file * [ADD] Leveling * Fix/issue #140 upgradepanel crash (#141) * Fixed bug causing to not be able to move current selection left on the upgrade panel tree * Fixed ImGui path in cmakelists Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * Fix/effect (#144) * fix: update joystick event * fix: elpased time a boolean flip * fix: add spell target * fix * Fixed deltatime misscalculation (#142) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Capped deltatime at 50ms (#143) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * add more spell :) (#145) * Fix/ennemies asset (#146) * [Fix] ASSETS OF ZOMBIE + SUMMONERS(CASTER) + GOLEM * [ADD] golem turret * [ADD] Boss PILACHU * [Modif] New boss speed and attack Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/mirrored repeated (#149) * feat: add mirrored repeated texture (breaking changes) * fix: cash, delete deprecated texture * fix: repeated and add map texture Co-authored-by: Yanis-F <yanis.fourel@gmail.com> * Fixed bug causin aiming sight to remaining floating on the map after respawn (#148) Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/attack animation (#150) * fix: fix spritesheet path for death * feat: add animation sprite for each classes * feat: add new classes icon * feat: Change spells desciption Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> * Feat/all spell t2 (#152) * feat: add barrel broken, fix texture shovel, add rock (no tag wall) * fix: barrel don t segfault * fix: some bugs (still crashes) * feat: add explosion bugged on barrel destroy * feat: add spells icons (#153) * feat: add barrel * doc: update doc * Feat/barrel & Fix some bugs (#154) * fix: some bugs (still crashes) * feat: add explosion bugged on barrel destroy * feat: add barrel * doc: update doc * feat: implement icons in json * Feat/misc sounds (#155) * fixed build * Added level up sound * Added key pickup sound Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * Feat/game balance (#158) * feat: balance hp and spd for the classes * feat: change ennemies value * Doc/readme update (#159) * doc: update readme * fix: pipeline on PR * Feat/keyboard binds rework (#160) * Fixed errors in spell descriptions * Reworked keyboard binds to be intuitive * Fixed keyboard movement when releasing and pressing keys controlling same axis during the same frame * Added keyboard controls to howtoplay menu Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> * [ADD] skeleton anim (#157) * [ADD] skeleton anim * [MERGE] FIX * [MERGE] Fix in spellfactory entity health Co-authored-by: Mathieu Lala <mathieu.lala@epitech.eu> * tweak (#161) * [Modif] change balance of classes and spells (#162) * bump: v0.4.0 Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr> Co-authored-by: Yanis-F <yanis.fourel@gmail.com> Co-authored-by: yanis fourel <yanis.fourel@epitech.eu> Co-authored-by: Pierre-Genest <pg.e@outlook.fr> Co-authored-by: Benjamin Praud <36664851+BenjaminPraud@users.noreply.github.com> Co-authored-by: Pierre-Genest <55022949+Pierre-Genest@users.noreply.github.com> Co-authored-by: Pierre-Genest <pge@outlook.fr> Co-authored-by: ADeal24 <adil.rajabaly@hotmail.fr>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When changing class, current HP change according to the change of the max HP
How Has This Been Tested?
manual
Types of changes
Checklist: