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

add ace arsenal button to main menu #5953

Merged
merged 19 commits into from
Dec 27, 2017
Merged

add ace arsenal button to main menu #5953

merged 19 commits into from
Dec 27, 2017

Conversation

commy2
Copy link
Contributor

@commy2 commy2 commented Dec 22, 2017 •
edited
Loading

When merged this pull request will:

@commy2 commy2 added kind/feature Release Notes: **ADDED:** status/WIP labels Dec 22, 2017
@commy2
Copy link
Contributor Author

commy2 commented Dec 22, 2017

https://i.imgur.com/TsmLLa5.png

jonpas
jonpas previously requested changes Dec 22, 2017
View reviewed changes
addons/arsenal/stringtable.xml Outdated
@@ -433,5 +433,17 @@
<Italian>Impossibile aprire l'arsenale ACE</Italian>
<Japanese>ACE 武器庫を開けません</Japanese>
</Key>
<Key ID="STR_ACE_Arsenal_Mission">
<English>ACE Virtual Arsenal</English>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be just "ACE Arsenal".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 The descriptions are placeholder / copy paste atm.

@jonpas
Copy link
Member

jonpas commented Dec 22, 2017

replace vanilla arsenal with ace arsenal inside the mission

Meaning in that mission that loads? As in a back to ACE Arsenal instead of Virtual Arsenal?

@commy2
Copy link
Contributor Author

commy2 commented Dec 22, 2017

The ACE Arsenal mission loads the vanilla arsenal, both automatically and by returning from the mission.
This is because all scripts of the mission are copy pasted atm.

@jonpas
Copy link
Member

jonpas commented Dec 22, 2017

Ah okay.

@commy2 commy2 mentioned this pull request Dec 22, 2017
Merged
@Dystopian
Copy link
Contributor

partly related to #5932. If setting is set there will be 2 ACE Arsenal in main menu :)

@bux
Copy link
Member

bux commented Dec 22, 2017

Currently you can't exit the mission 😄

@commy2
Copy link
Contributor Author

commy2 commented Dec 22, 2017

I know. lol

@commy2 commy2 removed the status/WIP label Dec 22, 2017
@alganthe
Copy link
Contributor

I am alganthe, and this is my favorite PR in the ACE3 repo.

@bux
Copy link
Member

bux commented Dec 23, 2017

When starting the mission invisble dudes shout Farsi at you. It's a bit ... disturbing.

bux
bux reviewed Dec 23, 2017
View reviewed changes
addons/arsenal/stringtable.xml Outdated
<German>Zurück zum ACE-Arsenal.</German>
</Key>
<Key ID="STR_ACE_Arsenal_Mission_tooltip">
<English>Not as bad as the regular one.</English>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's find something better than that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm all ears.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A more splendid Arsenal experience

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we aren't using "splendid", we aren't BI!

@bux
Copy link
Member

bux commented Dec 23, 2017

VA has one more button at the bottom: "Exit" and our "Close" is called "Try" in their UI.

Ours is a bit confusing

@commy2
Copy link
Contributor Author

commy2 commented Dec 24, 2017

I'd like if it saves the last loadout you had when you exit and to restore it when you enter it again.

@jonpas jonpas added this to the 3.13.0 milestone Dec 24, 2017
@commy2
Copy link
Contributor Author

commy2 commented Dec 24, 2017

Done, done and done.

@commy2 commy2 merged commit 37e42de into master Dec 27, 2017
@commy2 commy2 deleted the arsenal-main-menu branch December 27, 2017 10:39
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.1 Dec 31, 2017
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
@commy2
Merge pull request #5953 from acemod/arsenal-main-menu
b978327 
add ace arsenal button to main menu
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dedmen dedmen dedmen left review comments

@jonpas jonpas jonpas left review comments

@bux bux bux approved these changes

Assignees
No one assigned
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Milestone
3.12.1
Development

Successfully merging this pull request may close these issues.
7 participants
@commy2 @jonpas @Dystopian @bux @alganthe @dedmen @PabstMirror