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

Add the ability to edit user placed markers #6564

Merged
merged 6 commits into from
Sep 17, 2018

Conversation

Timi007
Copy link
Contributor

@Timi007 Timi007 commented Sep 5, 2018

When merged this pull request will:

  • Add the ability to edit user placed markers by double clicking at a marker
  • Remove the direct channel as a valid channel because selecting it ingame will not select the default (group) channel but instead the global
  • Optimize the method to get the current map display
  • To some extend also allow to copy markers by e.g. starting to edit a marker, canceling it and then creating a new marker with the same properties as the edited marker

@jonpas
Copy link
Member

jonpas commented Sep 5, 2018

I like this! Editing markers!

@commy2
Copy link
Contributor

commy2 commented Sep 5, 2018

Nice, this is why I love open source.

@jonpas jonpas added the kind/enhancement Release Notes: **IMPROVED:** label Sep 5, 2018
@jonpas jonpas added this to the 3.13.0 milestone Sep 5, 2018
Copy link
Contributor

@dedmen dedmen left a comment

Choose a reason for hiding this comment

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

I love this :u

private _mapIDD = -1;
private _mapDisplay = displayParent _display;
if (isNull _mapDisplay) exitWith {ERROR("No Map");};
private _mapCtrl = _mapDisplay displayctrl 51;
Copy link
Member

Choose a reason for hiding this comment

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

displayCtrl

if (_mouseOverType isEqualTo "marker") then {
if !((_marker find "_USER_DEFINED") isEqualTo -1) then {
GVAR(editingMarker) = _marker;
//hide marker which is being edited because if the user cancels editing, it will still exits unchanged
Copy link
Member

Choose a reason for hiding this comment

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

exist

@Timi007
Copy link
Contributor Author

Timi007 commented Sep 6, 2018

@bux Corrected all spelling mistakes (at least those which I could find)

@dedmen
Copy link
Contributor

dedmen commented Sep 6, 2018

🐝

Copy link
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

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

Looks good

@PabstMirror PabstMirror merged commit 7988622 into acemod:master Sep 17, 2018
Grey-Soldierman pushed a commit to Grey-Soldierman/ACE3 that referenced this pull request Sep 18, 2018
* add the ability to edit user placed markers

* remove direct channel from valid channels

* add author

* optimize get map display

replace old method of getting the map display with displayParent

* optimize code by adding isEqualTo

* correct some spelling mistakes
@PabstMirror
Copy link
Contributor

We might want to disable this for line type markers as they will be converted to a icon, which doesn't make sense to me.

@Timi007 Timi007 deleted the markerEditing branch September 24, 2018 18:20
@Timi007 Timi007 restored the markerEditing branch September 24, 2018 18:20
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.4 Nov 9, 2018
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* add the ability to edit user placed markers

* remove direct channel from valid channels

* add author

* optimize get map display

replace old method of getting the map display with displayParent

* optimize code by adding isEqualTo

* correct some spelling mistakes
@Timi007 Timi007 deleted the markerEditing branch October 16, 2021 13:37
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.

6 participants