issue#434 speedTime 아이템의 매커니즘 변경 해결 #437
Merged
Conversation
This file contains 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
Ochodus
changed the title
StillnessFate
added
enhancement
Ochodus
changed the title
|
실수로 번호를 착각한거 같네요... 수정했습니다. |
jaeheeLee17
added a commit
to jaeheeLee17/Galtron
that referenced
this pull request
Apr 18, 2018
* inureyes#406 (inureyes#422) * Issues inureyes#269 세팅메뉴에 intercept 버튼추가, 플레이중 esc 누를시 게임종료할건지 한번 더 물어봄 (inureyes#421) * 세팅메뉴에 intercept 버튼추가, 플레이중 esc 누를 시 게임종료 할껀지 한번 더 물어봄 * charge, ultimate, life 글씨 추가 * refs inureyes#444 : modify - wrong README.md * Resolved inureyes#430 (inureyes#431) * license for sounds added * some mistakes * - Added new bullets. COOOOOL! Thanks to Bonsaiheldin. See this : https://opengameart.org/content/sci-fi-space-simple-bullets - Moved unnecessary gfx files to another folder 'old_gfx' (But not all) * refs inureyes#430 : bugfix - typo * speedTime 아이템의 매커니즘 변경 (inureyes#437) * 일부 들여쓰기 일관성 문제 수정 (inureyes#439) * Rebase * Fix incorrect indentation * issue#385 아이템의 위력 세분화 해결 (inureyes#438) * speedTime 아이템의 매커니즘 변경 * 크기에 따라 위력이 달라지도록 아이템 작동 방식 변경. 그에 따른 아이템의 위력 조정. * inureyes#432 Bug is fixed (inureyes#436) * inureyes#432 bug is fixed * refs inureyes#436 : bugfix - missing variable * Fix README.md: inureyes#444 (inureyes#445) * charge, ultimate, life 글씨 추가 * README.md fix 마크다운 문법에 알맞게 수정하였습니다. * resolved inureyes#387(no conflict) (inureyes#427) * resolved inureyes#387 * * modify - naming scheme to know the difference between invincibility and shield * resolve inureyes#393, inureyes#398 issue (inureyes#411) * remodify code for issue inureyes#393, inureyes#398 * refs inureyes#411, inureyes#398 : bugfix - revert some of eafb56e which disables speed setting on menu. * When you delete others' code, review and understand first. * refs inureyes#411 : bugfix - wrong rollback / reference * * Modify indentations * refs inureyes#411 : bugfix - when self.Limit = 0, alien / fleetDrop stops.
bean3
added a commit
to bean3/Galtron
that referenced
this pull request
Apr 19, 2018
* 'master' of https://github.com/inureyes/Galtron: (205 commits) Revert "Merge branch 'master' into master" refs inureyes#411 : bugfix - when self.Limit = 0, alien / fleetDrop stops. * Modify indentations refs inureyes#411 : bugfix - wrong rollback / reference refs inureyes#411, inureyes#398 : bugfix - revert some of eafb56e which disables speed setting on menu. * When you delete others' code, review and understand first. resolve inureyes#393, inureyes#398 issue (inureyes#411) * modify - naming scheme to know the difference between invincibility and shield resolved inureyes#387(no conflict) (inureyes#427) Fix README.md: inureyes#444 (inureyes#445) refs inureyes#436 : bugfix - missing variable inureyes#432 Bug is fixed (inureyes#436) issue#385 아이템의 위력 세분화 해결 (inureyes#438) 일부 들여쓰기 일관성 문제 수정 (inureyes#439) speedTime 아이템의 매커니즘 변경 (inureyes#437) refs inureyes#430 : bugfix - typo Resolved inureyes#430 (inureyes#431) refs inureyes#444 : modify - wrong README.md Issues inureyes#269 세팅메뉴에 intercept 버튼추가, 플레이중 esc 누를시 게임종료할건지 한번 더 물어봄 (inureyes#421) inureyes#406 (inureyes#422) Rebase ... # Conflicts: # alien.py # gameFunctions.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
speedTime 아이템의 스피드 증가량을 대폭 낮추고 최대 4번까지 중첩되도록 변경. 대신 지속시간 소폭 상승. slowTime 아이템의 경우 정상적으로 작동하고 프레임 드랍은 다른 원인이 있는 걸로 생각되어 변경 하지 않음. 또한 speedTime의 지속시간 경과 후 원래 속도 회복 방식 변경.