Home Explore
Register Sign In
GooseHouse
/
game-client
5
1
Fork 0
Files Issues 3 Pull Requests 0 Wiki
Labels Milestones
New Pull Request

#61 [test_supereffect] => [dev]

Closed
igorbat99 wants to merge 0 commits from GooseHouse/test_supereffect into GooseHouse/dev
Conversation 1 Commits N/A Files changed N/A
igorbat99 commented 6 years ago

теперь оно компилируется. При слиянии выбрать версию unit.h и unit.cpp от Аркадия(использованы методы setHealthPoints, getMaxHealthPoints и поле max_healthpoints )

теперь оно компилируется. При слиянии выбрать версию unit.h и unit.cpp от Аркадия(использованы методы setHealthPoints, getMaxHealthPoints и поле max_health_points_ )
Ivan Arkhipov commented 6 years ago
Owner

Merged manually in http://git.gi1dor.ru/GooseHouse/game-client/commit/8dc39feb88ac2f57dca6d7098fc0aa9f5002b1d7

Merged manually in http://git.gi1dor.ru/GooseHouse/game-client/commit/8dc39feb88ac2f57dca6d7098fc0aa9f5002b1d7
Endevir closed 6 years ago
Please reopen this pull request to perform merge operation.
Sign in to join this conversation.
Labels
Clear labels
bug enhancement Аркадий Ваня Егор Игорь
No Label
bug
enhancement
Аркадий
Ваня
Егор
Игорь
Milestone
Clear milestone
No Milestone
3-ий дедлайн по проекту
Assignee
Clear assignee
No assignee
igorbat99
2 Participants
Write Preview
Loading...
Cancel
Save
There is no content yet.