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

Tagging X #3210

Merged
merged 27 commits into from
Feb 20, 2016
Merged

Tagging X #3210

merged 27 commits into from
Feb 20, 2016

Conversation

nicolasbadano
Copy link
Contributor

This is based on #1813, and if accepted, should replaced it.

I took @BaerMitUmlaut and made quite a few modifications:

  • Replaced "Tag wall" and "Tag ground" for a single "Tag" action, that places the tag on whatever you are looking at (ground, house, wall, etc)
  • Add pretty strict check to see if surface to tag is big and plane enough (tests 5 the 5 nodes of the cross)
  • Allow tagging both the ground and any static object, even those that don't support isKindOf. This technique could be usefull for other things too.
  • Handles the destruction of all objects that can be tagged. Solution based on handledamage for objects that support it, and based on periodic testing for objects that don't. All this is handled on the server to allow JIP compatibility.
  • Slightly simplified condition to show the action on the self interact menu (for performance reason), so at times the action is shown but the tagging is not performed when tried. I don't think this is a big issue though.

Seems to work pretty well, but more testing would be welcome. I'm pretty sure there are some corner cases that could be improved.

BaerMitUmlaut and others added 25 commits July 7, 2015 01:40
@BaerMitUmlaut
Tagging initial commit
22dfeef
@BaerMitUmlaut
Added function headers, removed debug stuff
22a4e21
@BaerMitUmlaut
Added interaction and item
fbb066d
@BaerMitUmlaut
Removed dummy model for now
150f888
@BaerMitUmlaut
Added readme
7eb7722
@BaerMitUmlaut
Added myself to contributors
86fbe3c
@BaerMitUmlaut
Config improvements
1748d23
@BaerMitUmlaut
Config fix
a0202c4
@BaerMitUmlaut
Updated model
e4f1a41
@BaerMitUmlaut
Merge remote-tracking branch 'upstream/master' into tagging
0d2db27 
Conflicts:
	AUTHORS.txt
@BaerMitUmlaut
Added spray and animation, eyepos cached
1532fe3
@BaerMitUmlaut
Updated sound & anim, added ground tagging
7262690
@BaerMitUmlaut
Added tag ground interaction
af7d596
@BaerMitUmlaut
Added multiple tag colors
7fe5cf7
@BaerMitUmlaut
Cleanup of old files
9cba6c6
@BaerMitUmlaut
Added tag destruction on object destruction
c532d89
@BaerMitUmlaut
Update to lineIntersectsSurfaces and params
93ea0c5
@BaerMitUmlaut
Merge fix
01c37f5
@BaerMitUmlaut
Added GEOM backup LOD
2898fd6
@nicolasbadano
Merge branch 'master' into tagging
e113853
@nicolasbadano
Replace player for ACE_player
a22203a
@nicolasbadano
- Tagging cleanup.
ad96617 
- Replaced "Tag wall" and "Tag ground" for a single "Tag" action.
- Added more reliable checks before placing the tag
- Allowed non-player units to tag (via API).
- Replaced execRemoteFnc by events
@nicolasbadano
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into taggingX
b020d88
@nicolasbadano
Allow tagging wrongly configured static objects.
e316365
@nicolasbadano
Handle destruction of tags placed on objects that don't support handl…
74b6036 
…edamage.
@nicolasbadano nicolasbadano added the kind/enhancement Release Notes: **IMPROVED:** label Jan 23, 2016
@nicolasbadano nicolasbadano added this to the 3.5.0 milestone Jan 23, 2016
@thojkooi thojkooi mentioned this pull request Feb 4, 2016
Closed
@thojkooi thojkooi added the kind/feature Release Notes: **ADDED:** label Feb 4, 2016
thojkooi added a commit that referenced this pull request Feb 20, 2016
@thojkooi
Merge pull request #3210 from acemod/taggingX
8055eae 
Tagging X
@thojkooi thojkooi merged commit 8055eae into master Feb 20, 2016
@thojkooi thojkooi deleted the taggingX branch February 20, 2016 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:** kind/feature Release Notes: **ADDED:**
Projects
None yet
Milestone
3.5.0
Development

Successfully merging this pull request may close these issues.
3 participants
@nicolasbadano @thojkooi @BaerMitUmlaut