Skip to content
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

Jump to bottom

Options Menu #98

Merged
merged 38 commits into from
Apr 23, 2019
Merged

Options Menu #98

merged 38 commits into from
Apr 23, 2019

Conversation

MiguelZh
Copy link
Collaborator

No description provided.

MiguelZh and others added 13 commits April 18, 2019 13:27
@MiguelZh
d
49bda12
@MiguelZh
feat: added exit button, all textures are placeholders
8fa97ea
@MiguelZh
src: added new image
5584096
@MiguelZh
testing
275b057
@MiguelZh
what is this
2a536a8
@MiguelZh
Revert "what is this"
be65587 
This reverts commit 2a536a8.
@onaranjoUCM @MiguelZh
New skipTurn button (#93)
ee33fa0 
* New skipTurn button

Also skill buttons removed

* Correctly resized button
@MiguelZh
done (#96)
2727946
@onaranjoUCM @MiguelZh
Defence and negative health (#94)
309f9d3 
* fix: Negative health units

* fix: Unit not ending turn after move+attack

* feat: Defense reworked to be percent

* lint
@kyranet @MiguelZh
refactor: Reworked Team, Unit, and TurnBar (#97)
287be00 
* misc: Reworked Team, Unit, and TurnBar

Also started tweaking the controllers, they're going to need a large refactor after all.

* fix: First running version of the game

* fix: TurnBar not rendering correctly

* fix: Per-team turn position not working cyclically

* fix: Resolved crash when a unit dies

* fix: Prepare after removing a unit

* cleanup: Removed unused code from previous commits

* fix: Sort units by their speed
@onaranjoUCM @MiguelZh
Battalion attack fix (#99)
92c4fc0 
* fix: Battalion attack decreases with size

* rebase fix
@MiguelZh
feat: added mute and unmute, texts are placeholders
4ba09e4
@MiguelZh
src: added icons
2937096
@MiguelZh MiguelZh marked this pull request as ready for review April 20, 2019 12:25
@MiguelZh MiguelZh changed the title WIP: Options Menu Options Menu Apr 20, 2019
@MiguelZh MiguelZh added the m: enhancement Issues and PRs related to the enhancement of current features label Apr 20, 2019
@MiguelZh MiguelZh added this to the Guerrilla milestone Apr 20, 2019
kyranet
kyranet requested changes Apr 21, 2019
View reviewed changes
Drakhtar/Managers/SDLAudioManager.cpp Outdated Show resolved Hide resolved
Drakhtar/Managers/SDLAudioManager.h Outdated Show resolved Hide resolved
images/UI/desktop.ini Outdated Show resolved Hide resolved
@MiguelZh MiguelZh changed the title Options Menu WiP: Options Menu Apr 21, 2019
@MiguelZh MiguelZh changed the title WiP: Options Menu Options Menu Apr 22, 2019
@MiguelZh MiguelZh added the t: feature Issues and PRs related to new features label Apr 22, 2019
@kyranet kyranet merged commit e85cee9 into master Apr 23, 2019
@kyranet kyranet deleted the OptionsMenu branch April 23, 2019 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kyranet kyranet kyranet approved these changes

@JavierCamachoUCM JavierCamachoUCM JavierCamachoUCM approved these changes

Assignees
No one assigned
Labels
m: enhancement Issues and PRs related to the enhancement of current features t: feature Issues and PRs related to new features
Projects
None yet
Milestone
Guerrilla
Development

Successfully merging this pull request may close these issues.
4 participants
@MiguelZh @kyranet @JavierCamachoUCM @onaranjoUCM