Skip to content

Dev stable#35

Merged
parfen01 merged 19 commits into
mainfrom
dev_stable
Jun 4, 2022
Merged

Dev stable#35
parfen01 merged 19 commits into
mainfrom
dev_stable

Conversation

@parfen01
Copy link
Copy Markdown
Collaborator

@parfen01 parfen01 commented Jun 4, 2022

No description provided.

jansenin and others added 19 commits April 12, 2022 22:33
* 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>
* 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
* Made Wave and WaveManager

* Fixed cpplint

* Fixed CMake

* Deleted headers from CMake

* Fixed invalidation of iterators

* Micro fix
* add customizable base classes

* add getters to scene

* fix cpplint
* add customizable base classes

* add getters to scene

* test use of animations, many other fixes

Если кратко, то вот:
1)Тестовый моб теперь может чуть больше и у него есть анимации
2)Самонаводящиеся пули перескакивают на других мобов при смерти первоначальных
* 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>
* Skeleton

* Cobra, hedgehog, dwarf

* Fixed cpplint

* Fixed cpplint once again

* Fixed routes, scaled mobs
* 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>
* 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>
* 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>
* Moved mehanics from tested tower and toweslots

* Made two towers

* Fixed cpplint

* Fixed cpplint once again

* Deleted tests objects
* created trap, bomb, coins

* fixed ci

* fixed ci try2

* added nolint
* Added BIG_mechanic

* Fixed cmake

* Fixed issues from last pull request
* reworked balance system. all entities got their cost

* ci...

* fixed LoseBalanse
* Made special projectiles for towers and animation for them

* Fixed cpplint

* Added images

* Fixed cpplint once again
* First level

* Fixed ci
* add hp and money ui

* hp and money interface

* cpplint
@parfen01 parfen01 merged commit 762709d into main Jun 4, 2022
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.

5 participants