Skip to content

Game level management#20

Merged
artsiom-saladukha merged 14 commits into
dev_stablefrom
game_level_management
Jun 1, 2022
Merged

Game level management#20
artsiom-saladukha merged 14 commits into
dev_stablefrom
game_level_management

Conversation

@artsiom-saladukha
Copy link
Copy Markdown
Collaborator

We are pretty sure that it will be modified, but check our code, please)

jansenin and others added 10 commits May 19, 2022 21:18
Если кратко, то вот:
1)Тестовый моб теперь может чуть больше и у него есть анимации
2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных
Copy link
Copy Markdown
Collaborator

@Dima-Makarov Dima-Makarov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вроде норм, только зачем тут ещё анимации...

Comment thread level.cpp
jansenin
jansenin previously approved these changes Jun 1, 2022
Dima-Makarov
Dima-Makarov previously approved these changes Jun 1, 2022
@artsiom-saladukha artsiom-saladukha dismissed stale reviews from Dima-Makarov and jansenin via 3557da7 June 1, 2022 14:33
@jansenin jansenin self-requested a review June 1, 2022 14:51
@artsiom-saladukha artsiom-saladukha merged commit cbf205b into dev_stable Jun 1, 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>
@parfen01 parfen01 deleted the game_level_management branch June 4, 2022 05:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants