Skip to content

Code/andrey m #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amuk1989 wants to merge 23 commits into
base: MPV/April
Choose a base branch
from
Open

Code/andrey m #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ce44dda
Инветарь v.1 (monobehaviour)
divine-courage May 8, 2020
a0371d9
ultra-mini commit
divine-courage May 8, 2020
a3bf186
Маленькие правки для код конвеншена
divine-courage May 11, 2020
0e9fe29
Крафт (при дропе одного предмета на другой, может совершиться магия к…
divine-courage May 12, 2020
2402b60
Простая реализация tooltip для инвентаря
divine-courage May 14, 2020
34b4e81
Merge branch 'code/anastasiya-e/inventory' into MVP/may
divine-courage May 16, 2020
69b72b3
UI
FeodorG May 17, 2020
898396d
Tooltips
FeodorG May 18, 2020
4196958
Merge pull request #40 from FeodorG/code/feodor-g/tooltips
GameLineEntertainment May 18, 2020
346311c
Правки
divine-courage May 20, 2020
8f9eade
Merge pull request #39 from divine-courage/code/anastasia-e/crafting-…
GameLineEntertainment May 21, 2020
f33114e
Анимации + чуть менее наговнокоженная стейт машина
divine-courage May 31, 2020
57f2be4
Merge pull request #41 from divine-courage/code/anastasiya-e/animator
GameLineEntertainment May 31, 2020
cdee65a
Инфраструтура для пазлов и первый пазл "WiresPuzzle"
KotikovD Aug 3, 2020
9f27d76
Правки по архитектуре для пазлов
KotikovD Aug 5, 2020
8f6e70e
Рефакторинг
KotikovD Aug 7, 2020
87ffd08
Доработка пазла с проводами
KotikovD Aug 23, 2020
a173dac
Пазл провода завршен
KotikovD Sep 13, 2020
b87b19b
Финальные правки по проводам
KotikovD Sep 27, 2020
2aeb59c
Разложил по папкам файлы в соответвии с принипами модульности
KotikovD Sep 27, 2020
decd180
Merge pull request #43 from KotikovD/code/dmitry-k/wires-puzzle
RomanAstra Oct 4, 2020
411cfed
FirstIterration
amuk1989 Nov 25, 2020
28aa7e5
SafeDepositePuzzle
amuk1989 Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 28 additions & 131 deletions Rescues/.idea/.idea.Rescues/.idea/contentModel.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Rescues/.idea/.idea.Rescues/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading