Movement#16
Merged
Merged
Conversation
Dima-Makarov
requested changes
May 2, 2022
Dima-Makarov
requested changes
May 2, 2022
jansenin
reviewed
May 2, 2022
jansenin
reviewed
May 2, 2022
jansenin
reviewed
May 2, 2022
Dima-Makarov
approved these changes
May 3, 2022
jansenin
approved these changes
May 3, 2022
parfen01
added a commit
that referenced
this pull request
Jun 4, 2022
* Project base and demonstration of some features of that base (#1) * create basic project structure, model structure, add some graphics * improve code style * Refactored Model Added View, Controller. All necessary code moved from MainWindow to Controller. Reloaded Ticks for GameField and TowerSlot. * return to qt6 * add test mob,tower,tower slot,projectile, add resources Были добавлены тестовый моб, башня, слот для башни, самонаводящиеся пули, начато использование ресурсов(qresources) * improve code style * Refactoring Из основного: -Исходные файлы в CmakeLists были рассортированы -Некоторые пити теперь прописаны относительно корня проекта -Константы вынесены в один файл -Гуарды заменены на #pragma -PixmapLoader -Timer -VectorF * supress warning Co-authored-by: Parfenov <alex889986@gmail.com> * Movement (#16) * Made Route and add speed to mob * Fixed CMake * Complete Base Route * Fixed style * Made system one route to any entities * Fixed cpplint * Resolved problems * Fixed cpplint * Fixed cpplint once again * Fixed cpplint last time * Wave managment (#17) * Made Wave and WaveManager * Fixed cpplint * Fixed CMake * Deleted headers from CMake * Fixed invalidation of iterators * Micro fix * make customizable base classes (#18) * add customizable base classes * add getters to scene * fix cpplint * Animations (#19) * add customizable base classes * add getters to scene * test use of animations, many other fixes Если кратко, то вот: 1)Тестовый моб теперь может чуть больше и у него есть анимации 2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных * Game level management (#20) * add customizable base classes * add getters to scene * fix cpplint * test use of animations, many other fixes Если кратко, то вот: 1)Тестовый моб теперь может чуть больше и у него есть анимации 2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных * code style * more code style * fix custom literal error * Added level managing system, json-format level data storage. * Fixed cpplint. * Fixed cpplint (second time due to self-destroy of blank line). * Fixed cpplint. Co-authored-by: dzhen <jansenin@tut.by> * Different mobs (#21) * Skeleton * Cobra, hedgehog, dwarf * Fixed cpplint * Fixed cpplint once again * Fixed routes, scaled mobs * UI components (#22) * add customizable base classes * add getters to scene * fix cpplint * test use of animations, many other fixes Если кратко, то вот: 1)Тестовый моб теперь может чуть больше и у него есть анимации 2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных * code style * more code style * fix custom literal error * Added level managing system, json-format level data storage. * add textured box, toolpit, unfinished death system * add ui components(layouts, menus, text buttons, ...) Added: LinearLayout(horisontal and vertical) LinearMenu(horisontal and vertical) PaddingBox TextButton * add icons on buttons Co-authored-by: Artsiom S <art.saladukha@gmail.com> * Better autoguided projectiles (#23) * add customizable base classes * add getters to scene * fix cpplint * test use of animations, many other fixes Если кратко, то вот: 1)Тестовый моб теперь может чуть больше и у него есть анимации 2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных * code style * more code style * fix custom literal error * Added level managing system, json-format level data storage. * add textured box, toolpit, unfinished death system * add ui components(layouts, menus, text buttons, ...) Added: LinearLayout(horisontal and vertical) LinearMenu(horisontal and vertical) PaddingBox TextButton * add icons on buttons * change trajectory of TestProjectile * add linear movement Co-authored-by: Artsiom S <art.saladukha@gmail.com> * Explosion (#24) * add customizable base classes * add getters to scene * fix cpplint * test use of animations, many other fixes Если кратко, то вот: 1)Тестовый моб теперь может чуть больше и у него есть анимации 2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных * code style * more code style * fix custom literal error * Added level managing system, json-format level data storage. * add textured box, toolpit, unfinished death system * add ui components(layouts, menus, text buttons, ...) Added: LinearLayout(horisontal and vertical) LinearMenu(horisontal and vertical) PaddingBox TextButton * add icons on buttons * explosion * fix z-value Co-authored-by: Artsiom S <art.saladukha@gmail.com> * Different towers (#25) * Moved mehanics from tested tower and toweslots * Made two towers * Fixed cpplint * Fixed cpplint once again * Deleted tests objects * Feachures (#27) * created trap, bomb, coins * fixed ci * fixed ci try2 * added nolint * Big mehanic (#28) * Added BIG_mechanic * Fixed cmake * Fixed issues from last pull request * reworked balance system. all entities got their cost (#29) * reworked balance system. all entities got their cost * ci... * fixed LoseBalanse * Upgrade routes and projectiles (#30) * Made special projectiles for towers and animation for them * Fixed cpplint * Added images * Fixed cpplint once again * Upgraded routes, fixed bugs in towers upgrades (#31) * First level reformation (#32) * First level * Fixed ci * add hp and money ui (#33) * add hp and money ui * hp and money interface * cpplint * Big calls (#34) Co-authored-by: jansenin <59775038+jansenin@users.noreply.github.com> Co-authored-by: artsiom-saladukha <99528485+artsiom-saladukha@users.noreply.github.com> Co-authored-by: dzhen <jansenin@tut.by> Co-authored-by: Artsiom S <art.saladukha@gmail.com> Co-authored-by: exhaustedkid <99528470+exhaustedkid@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Создан класс Route, который хранит в себе вектор поинтов и мапку с ключём указателем на ентити и интовским значением, которое отображает номер последней пройденной точки в маршруте. Передвижение ентити в маршруте проходит путём передачи указателя на того ентити, которого хотите передвинуть и дистанцию, после изменения позиции ентити маршрут проверяет, нужно ли менять направление его движения на следующую вершину или нет. В моба добавлено поле указателя на Route. В дальнейшем нужно сделать так, чтобы начальная позиция моба инициализировалась
первой точкой в маршруте. Вектор маршрутов в дальнейшем должен храниться в уровне, откуда мобы будут его брать по номеру. Тестовый маршрут успешно интегрирован в тестового моба