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.

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

Multiple Devices #1118

Merged
merged 10 commits into from
Jun 13, 2015
Merged

Multiple Devices #1118

merged 10 commits into from
Jun 13, 2015

Conversation

PabstMirror
Copy link
Contributor

#1080 - (Equpiment menu is too crowded)

Adds a "handheld device" key bind system.
Devices register, condition code and codes for toggling and closing devices.
Home Key/Ctrl-Home toggles and closes the currently selected device.
Shift-Home cycles through available devices.

Also condenses the equipment menu so each device has a single base entry on the equipment tree.

untitled

For both the DAGR and the Kestral it's Equipment -> (Show Dialog) -> (Show/Hide Display)

@PabstMirror PabstMirror added kind/enhancement Release Notes: **IMPROVED:** status/discussion labels May 12, 2015
Conflicts:
	addons/common/stringtable.xml
@PabstMirror
Copy link
Contributor Author

@ulteq - this effects both of your devices, please let me know what you think of this

I am fine making any changes to this.

@ulteq
Copy link
Contributor

ulteq commented May 31, 2015

I like it.

Conflicts:
	addons/atragmx/initKeybinds.sqf
	addons/common/XEH_postInit.sqf
	addons/kestrel4500/CfgVehicles.hpp
	addons/kestrel4500/initKeybinds.sqf
	addons/microdagr/CfgVehicles.hpp
	addons/microdagr/XEH_clientInit.sqf
@ulteq
Copy link
Contributor

ulteq commented Jun 7, 2015

Will this be ready for 3.1.0?

ulteq added a commit that referenced this pull request Jun 10, 2015
* Also added the ability to copy your own rangecards
* Reference: #1118
Conflicts:
	addons/common/XEH_postInit.sqf
@thojkooi thojkooi added this to the 3.1.0 milestone Jun 13, 2015
PabstMirror added a commit that referenced this pull request Jun 13, 2015
@PabstMirror PabstMirror merged commit b2d6961 into master Jun 13, 2015
@PabstMirror PabstMirror deleted the multipleDevices branch June 13, 2015 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants