Added ability to change player type - #1
Open
FedotSoldier wants to merge 13 commits into
Open
Conversation
Aunmag
requested changes
Apr 7, 2019
Aunmag
requested changes
Apr 8, 2019
Owner
|
Лучше разделять каждую фичу отдельным реквестом. В данном случае добавление нового типа персонажа и типа оружия - немного разное. |
Aunmag
requested changes
Apr 11, 2019
Changed the mechanism of player choice
Various small innovations
# Conflicts: # src/main/java/aunmag/shooter/game/ai/Ai.java # src/main/java/aunmag/shooter/game/client/Player.kt # src/main/java/aunmag/shooter/game/client/player/Blackout.java # src/main/java/aunmag/shooter/game/client/states/Game.kt # src/main/java/aunmag/shooter/game/client/states/Pause.kt # src/main/java/aunmag/shooter/game/environment/actor/ActorType.java !Actor change does not work!
Aunmag
requested changes
Jun 28, 2019
| turningTo = null; | ||
| } | ||
|
|
||
| /* Setters */ |
Collaborator
Author
There was a problem hiding this comment.
Ну там же сеттеры по сути. Я и перенес этот комментарий, чтобы он был над ними. Раньше был под ними.
Метод reset не включил под этот комментарий, потому что это общий метод сброса состояния. Неизвестно, что туда ещё добавится. А те методы, над которыми я этот комментарий перенес типичные сеттеры - конкретное поле устанавливается в конкретное значение
Owner
There was a problem hiding this comment.
walkForward не принимает ведь аргументов, это не сеттер.
| 10 -> WeaponType.saiga12k | ||
| 11 -> WeaponType.pkm | ||
| 12 -> WeaponType.pkpPecheneg | ||
| 3 -> WeaponType.coltSingleActionArmy |
Owner
There was a problem hiding this comment.
Изначально планировалось что бы не первой волне были только пистолеты, на второй двуствольные ружья, далее ПП, и так далее
Collaborator
Author
There was a problem hiding this comment.
Сейчас все твои оружия могут выпасть только на тех же волнах как раньше. Плюс, к тем, которые могут выпасть на первой волне, добавляется револьвер.
Aunmag
requested changes
Jun 28, 2019
| src/main/resources/**/*.png | ||
| src/main/resources/**/*.ogg | ||
| src/main/resources/**/*.fnt | ||
|
|
| @@ -0,0 +1,49 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
Colt power reduced
Aunmag
force-pushed
the
master
branch
2 times, most recently
from
July 6, 2019 13:08
aeb12b9 to
f17b38a
Compare
# Conflicts: # src/main/java/aunmag/shooter/game/ai/strategies/Strategy.java # src/main/java/aunmag/shooter/game/client/states/Pause.kt # src/main/java/aunmag/shooter/game/environment/actor/Actor.java # src/main/java/aunmag/shooter/game/scenarios/ScenarioEncircling.kt
# Conflicts: # src/main/java/aunmag/shooter/game/ai/strategies/Strategy.java # src/main/java/aunmag/shooter/game/client/states/Pause.kt # src/main/java/aunmag/shooter/game/environment/actor/Actor.java # src/main/java/aunmag/shooter/game/scenarios/ScenarioEncircling.kt
Player choice implemented in non Kotlin version
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.