Code

MVP#4

Code

Open

kek-flip wants to merge 122 commits intomaincpp-park-vk-education/2023_1_Team96:mainfrom devcpp-park-vk-education/2023_1_Team96:devCopy head branch name to clipboard

+3,130

Commits

Commits on May 1, 2023

• Добавил gitignore

  kek-flip

  committed
  af8c761

  Copy full SHA for af8c761

• Добавил библиотеки eventpp и SFML

  kek-flip

  committed
  07d3a4d

  Copy full SHA for 07d3a4d

• Добавил игровой объект GameObject, интерфейс действия IAction и его реализации

  kek-flip

  committed
  d7e6231

  Copy full SHA for d7e6231

• Добавил интерфейс IObjectRepository репозитория объектов

  kek-flip

  committed
  34fd06a

  Copy full SHA for 34fd06a

• Добавил интерфейс IObjectFactory фабрики объектов

  kek-flip

  committed
  4c8ba39

  Copy full SHA for 4c8ba39

• Добавил класс игрока Player

  kek-flip

  committed
  6356d5a

  Copy full SHA for 6356d5a

• Добавил интефейс IGameModel игровой модели и его реализацию

  kek-flip

  committed
  95b5eb1

  Copy full SHA for 95b5eb1

Commits on May 3, 2023

• First build

  tomsuliana

  committed
  34fac73

  Copy full SHA for 34fac73

Commits on May 4, 2023

• Добавил главное окно

  kek-flip

  committed
  7372d95

  Copy full SHA for 7372d95

• Pictures and timer added

  tomsuliana

  committed
  04815ef

  Copy full SHA for 04815ef

• Refactored

  tomsuliana

  committed
  e94bf17

  Copy full SHA for e94bf17

• Добавил интерфейс ICommandManager менеджера команд и его реализацию

  kek-flip

  committed
  e5fabfb

  Copy full SHA for e5fabfb

• Добавлены связи между графикой и логикой

  

  wizardOfOz21

  authored and

  kek-flip

  committed
  f6f1c49

  Copy full SHA for f6f1c49

• Переименовал класс Event в GameEvent, добавил имя параметра в методе execute

  kek-flip

  committed
  5e3a2df

  Copy full SHA for 5e3a2df

• Добавил значения в EventType

  kek-flip

  committed
  c3f60fc

  Copy full SHA for c3f60fc

• Добавил значения в ModelType

  kek-flip

  committed
  c03d8c4

  Copy full SHA for c03d8c4

• Привел каркас в актуальное состояние

  kek-flip

  committed
  c9cc8a0

  Copy full SHA for c9cc8a0

• Merge branch 'dev' into view

  tomsuliana

  authored
  7083e77

  Copy full SHA for 7083e77

• Merge pull request #6 from cpp-park-vk-education/view

  Show description for 70d6f79
  kek-flip

  authored
  70d6f79

  Copy full SHA for 70d6f79

• Добавил сервер

  HallowAz

  committed
  a52776e

  Copy full SHA for a52776e

• Удалил ненужный файл

  kek-flip

  committed
  76153f1

  Copy full SHA for 76153f1

• Поправил cmake

  kek-flip

  committed
  35ae6a1

  Copy full SHA for 35ae6a1

Commits on May 12, 2023

• Добавлено игровое поле и расстановка юнитов

  wizardOfOz21

  committed
  9617ea5

  Copy full SHA for 9617ea5

Commits on May 13, 2023

• Добавил действия объекта

  kek-flip

  committed
  f0024b4

  Copy full SHA for f0024b4

• Добавил репозиторий объектов

  kek-flip

  committed
  746e558

  Copy full SHA for 746e558

• Добавил игровое поле

  kek-flip

  committed
  17a7658

  Copy full SHA for 17a7658

• Добавил фабрики объектов

  kek-flip

  committed
  eadd97f

  Copy full SHA for eadd97f

• Реализовал игровое поле

  kek-flip

  committed
  5dd484f

  Copy full SHA for 5dd484f

• Добавил новый метод в репозиторий объектов

  kek-flip

  committed
  7dac75a

  Copy full SHA for 7dac75a

• Изменил передвижение объектов

  kek-flip

  committed
  cc0ed2c

  Copy full SHA for cc0ed2c

• Пофиксил передвижение объектов

  kek-flip

  committed
  d12423e

  Copy full SHA for d12423e

• Восстановлены связи между модулями

  wizardOfOz21

  committed
  651ce99

  Copy full SHA for 651ce99

• Merge remote-tracking branch 'origin/implementation' into implementation

  wizardOfOz21

  committed
  e23e38c

  Copy full SHA for e23e38c

Commits on May 14, 2023

• Merge pull request #7 from cpp-park-vk-education/implementation

  Show description for efc5c33
  wizardOfOz21

  authored
  efc5c33

  Copy full SHA for efc5c33

• Добавлена возможность перемещения юнитов

  Show description for 4627f18
  wizardOfOz21

  committed
  4627f18

  Copy full SHA for 4627f18

• Merge pull request #8 from cpp-park-vk-education/move

  Show description for 8caf687
  wizardOfOz21

  authored
  8caf687

  Copy full SHA for 8caf687

Commits on May 15, 2023

• Добавлено взаимодействие с сетью

  Show description for 54e4940
  wizardOfOz21

  committed
  54e4940

  Copy full SHA for 54e4940

• Merge pull request #9 from cpp-park-vk-education/network

  Show description for 651a1bd
  wizardOfOz21

  authored
  651a1bd

  Copy full SHA for 651a1bd

• Классы разделены на отдельные файлы

  HallowAz

  committed
  3f4e91a

  Copy full SHA for 3f4e91a

• Рефакторинг создания и передвижения юнитов

  kek-flip

  committed
  3e304e6

  Copy full SHA for 3e304e6

• Merge pull request #10 from cpp-park-vk-education/create_and_move_refactoring

  Show description for b451bfd
  kek-flip

  authored
  b451bfd

  Copy full SHA for b451bfd

• Доработаны состояния и система команд

  wizardOfOz21

  committed
  1067e64

  Copy full SHA for 1067e64

• Merge remote-tracking branch 'origin/dev' into network

  wizardOfOz21

  committed
  cb9af8d

  Copy full SHA for cb9af8d

• Merge pull request #11 from cpp-park-vk-education/network

  Show description for 88a66be
  wizardOfOz21

  authored
  88a66be

  Copy full SHA for 88a66be

• Реализван класс Connection

  HallowAz

  committed
  7a10cb5

  Copy full SHA for 7a10cb5

• Реализован класс Match

  HallowAz

  committed
  9be46bf

  Copy full SHA for 9be46bf

Commits on May 16, 2023

• Добавлен сервер

  HallowAz

  committed
  19d310b

  Copy full SHA for 19d310b

• Добавлен клиент

  HallowAz

  committed
  471af9c

  Copy full SHA for 471af9c

• Заменил команды на автомат событий

  kek-flip

  committed
  0d4c1cb

  Copy full SHA for 0d4c1cb

• Merge pull request #12 from cpp-park-vk-education/serv

  Show description for 973d2bf
  kek-flip

  authored
  973d2bf

  Copy full SHA for 973d2bf

• Merge pull request #13 from cpp-park-vk-education/gamestate

  Show description for 572d7af
  kek-flip

  authored
  572d7af

  Copy full SHA for 572d7af

• Qt and sfml done first

  tomsuliana

  committed
  d9cef8e

  Copy full SHA for d9cef8e

• Добавил создание и распознавание команд сервера

  kek-flip

  committed
  fd3c104

  Copy full SHA for fd3c104

• Merge pull request #15 from cpp-park-vk-education/commands_to_server

  Show description for 84aa2a8
  kek-flip

  authored
  84aa2a8

  Copy full SHA for 84aa2a8

• Соединение работает, но проблема с приёмом сервером ответа остаётся

  HallowAz

  committed
  785d505

  Copy full SHA for 785d505

• Добавил сервер

  kek-flip

  committed
  227ec6d

  Copy full SHA for 227ec6d

• Merge branch 'qtandsfml' of github.com:cpp-park-vk-education/2023_1_Team96 into qtandsfml

  kek-flip

  committed
  fa55525

  Copy full SHA for fa55525

• Поправил названия hpp файлов

  kek-flip

  committed
  509a705

  Copy full SHA for 509a705

• Sfml into qt now

  tomsuliana

  committed
  d787066

  Copy full SHA for d787066

Commits on May 22, 2023

• Resize event upgaraded

  tomsuliana

  committed
  188581a

  Copy full SHA for 188581a

Commits on May 23, 2023

• New try to connect qt and sfml

  tomsuliana

  committed
  8468202

  Copy full SHA for 8468202

• Some modifications

  tomsuliana

  committed
  1242272

  Copy full SHA for 1242272

• Merge branch 'qtandsfml' of github.com:cpp-park-vk-education/2023_1_Team96 into qtandsfml

  tomsuliana

  committed
  35da38e

  Copy full SHA for 35da38e

• Удалил ненужное

  kek-flip

  committed
  7df09b0

  Copy full SHA for 7df09b0

• Подсветка выбранной клетки, отзеркаливание юнитов врага

  wizardOfOz21

  committed
  ac91ec0

  Copy full SHA for ac91ec0

• Merge pull request #17 from cpp-park-vk-education/choose&mirror

  Show description for 6917825
  kek-flip

  authored
  6917825

  Copy full SHA for 6917825

• Поправил форматирование

  kek-flip

  committed
  d151dfe

  Copy full SHA for d151dfe

• Добавил возможность юнитам атаковать друг друга

  kek-flip

  committed
  fb0dc38

  Copy full SHA for fb0dc38

• Добавил УБИЙСТВО юнитов

  kek-flip

  committed
  6cf8247

  Copy full SHA for 6cf8247

• Добавил ограничение на создание юнитов и кол-во действий за ход

  kek-flip

  committed
  4a9da11

  Copy full SHA for 4a9da11

Commits on May 24, 2023

• Добавил парсер команды атаки и пофиксил команду передвижения

  kek-flip

  committed
  a0cc0d9

  Copy full SHA for a0cc0d9

• Изменил сигнатуру HandleInput

  kek-flip

  committed
  497c6be

  Copy full SHA for 497c6be

• Добавил получение у поля всех объектов

  kek-flip

  committed
  628f3b0

  Copy full SHA for 628f3b0

• Добавил завершение игры по убийству всех юнитов одной из сторон

  kek-flip

  committed
  7399756

  Copy full SHA for 7399756

• Поправил форматирование

  kek-flip

  committed
  e20bcea

  Copy full SHA for e20bcea

• Перенес техтуры в static

  kek-flip

  committed
  86b4ff0

  Copy full SHA for 86b4ff0

• Merge pull request #18 from cpp-park-vk-education/gamelogic

  Show description for 6b83cd1
  kek-flip

  authored
  6b83cd1

  Copy full SHA for 6b83cd1

• no while

  tomsuliana

  committed
  ab071b6

  Copy full SHA for ab071b6

• Merge branch 'dev' into qtandsfml

  tomsuliana

  committed
  00af885

  Copy full SHA for 00af885

• Изменил текстуры юнита

  kek-flip

  committed
  363a35e

  Copy full SHA for 363a35e

• Merge branch 'dev' of github.com:cpp-park-vk-education/2023_1_Team96 into graphic_refactoring

  kek-flip

  committed
  bc3afba

  Copy full SHA for bc3afba

• Переименовал вызов метода

  kek-flip

  committed
  05a663e

  Copy full SHA for 05a663e

• Qt events work now

  tomsuliana

  committed
  46d6391

  Copy full SHA for 46d6391

• Сделал анимацию атаки

  kek-flip

  committed
  c48291e

  Copy full SHA for c48291e

• All qt signals done

  tomsuliana

  committed
  c938b8e

  Copy full SHA for c938b8e

• Merge pull request #19 from cpp-park-vk-education/graphic_refactoring

  Show description for cef7514
  kek-flip

  authored
  cef7514

  Copy full SHA for cef7514

• Merge branch 'dev' into qtandsfml

  kek-flip

  committed
  80bd1f8

  Copy full SHA for 80bd1f8

Commits on May 25, 2023

• ура я это запустил и почистил

  kek-flip

  committed
  8f4573c

  Copy full SHA for 8f4573c

• --amend

  kek-flip

  committed
  3752055

  Copy full SHA for 3752055

• Рефакторинг:

  Show description for 3852efb
  kek-flip

  committed
  3852efb

  Copy full SHA for 3852efb

• Добавлена модель короля.

  Show description for 489c217
  wizardOfOz21

  committed
  489c217

  Copy full SHA for 489c217

• Some changes

  tomsuliana

  committed
  72c2ba0

  Copy full SHA for 72c2ba0

• Merge branch 'qtandsfml' of github.com:cpp-park-vk-education/2023_1_Team96 into qtandsfml

  tomsuliana

  committed
  93f0055

  Copy full SHA for 93f0055

• Bug with transparent window fixed

  tomsuliana

  committed
  30585ae

  Copy full SHA for 30585ae

• Сервер получает сообщения, асинхронно и от двух клиентов. Осталось наладить создание матча и приём клиента

  HallowAz

  committed
  3661d94

  Copy full SHA for 3661d94

• Merge pull request #20 from cpp-park-vk-education/models_update

  Show description for d6df63a
  kek-flip

  authored
  d6df63a

  Copy full SHA for d6df63a

• Merge branch 'dev' into qtandsfml

  kek-flip

  committed
  ab0f649

  Copy full SHA for ab0f649

• Поправил слияние

  kek-flip

  committed
  0104cdc

  Copy full SHA for 0104cdc

• Merge branch 'qtandsfml' of github.com:cpp-park-vk-education/2023_1_Team96 into qtandsfml

  kek-flip

  committed
  f02055b

  Copy full SHA for f02055b

• Удалил ненужное

  kek-flip

  committed
  e6c630d

  Copy full SHA for e6c630d

• Resizing is available

  tomsuliana

  committed
  d96d986

  Copy full SHA for d96d986

• Полностью рабочая сетевая часть

  HallowAz

  committed
  54998b0

  Copy full SHA for 54998b0

• Merge branch 'dev' of https://github.com/cpp-park-vk-education/2023_1_Team96 into dev

  HallowAz

  committed
  ab2584a

  Copy full SHA for ab2584a

• Убрали таймер

  kek-flip

  committed
  98c2302

  Copy full SHA for 98c2302

• Merge branch 'dev' into qtandsfml

  kek-flip

  committed
  2a02622

  Copy full SHA for 2a02622

• Merge pull request #14 from cpp-park-vk-education/qtandsfml

  Show description for fe1df32
  kek-flip

  authored
  fe1df32

  Copy full SHA for fe1df32

Commits on May 31, 2023

• Добавил скобки к if

  kek-flip

  committed
  7cdbcfd

  Copy full SHA for 7cdbcfd

• Пофиксил анимацию атаки и убрал возможность бить себя по голове

  kek-flip

  committed
  060b815

  Copy full SHA for 060b815

• Game window resized

  tomsuliana

  committed
  bc47bf5

  Copy full SHA for bc47bf5

• Merge pull request #21 from cpp-park-vk-education/qtandsfml

  Show description for 66e5860
  kek-flip

  authored
  66e5860

  Copy full SHA for 66e5860

• Добавил возможность создания короля

  kek-flip

  committed
  e9a8eee

  Copy full SHA for e9a8eee

• Добавил завершение игры по смерти короля

  kek-flip

  committed
  2d1d74d

  Copy full SHA for 2d1d74d

Commits on Jun 1, 2023

• Переработана карта, добавлены анимации

  wizardOfOz21

  committed
  83886d2

  Copy full SHA for 83886d2

Commits on Jun 2, 2023

• Merge pull request #22 from cpp-park-vk-education/king

  Show description for b4e44de
  wizardOfOz21

  authored
  b4e44de

  Copy full SHA for b4e44de

• Merge remote-tracking branch 'origin/dev' into animation

  wizardOfOz21

  committed
  ba99946

  Copy full SHA for ba99946

• Исправлена ошибка слияния

  wizardOfOz21

  committed
  ad63505

  Copy full SHA for ad63505

• Merge pull request #24 from cpp-park-vk-education/animation

  Show description for b46cdb8
  wizardOfOz21

  authored
  b46cdb8

  Copy full SHA for b46cdb8

• Рефакторинг классов, исправление нейминга

  wizardOfOz21

  committed
  b0d4726

  Copy full SHA for b0d4726

• Merge pull request #25 from cpp-park-vk-education/graphics_refactoring

  Show description for a230464
  wizardOfOz21

  authored
  a230464

  Copy full SHA for a230464

• Добавлен файл конфигурации

  wizardOfOz21

  committed
  15d5dd9

  Copy full SHA for 15d5dd9

• Добавлен парсинг конфигурации из файла

  wizardOfOz21

  committed
  863a223

  Copy full SHA for 863a223

• Merge pull request #27 from cpp-park-vk-education/json_config

  Show description for 6f52afc
  wizardOfOz21

  authored
  6f52afc

  Copy full SHA for 6f52afc