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

Resync mine orientations in JIP. #3398

Merged
merged 17 commits into from Feb 27, 2016
Merged

Resync mine orientations in JIP. #3398

merged 17 commits into from Feb 27, 2016

Commits on Feb 23, 2016

  1. Resync mine orientations in JIP. Fix #3317

    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    645ed3e View commit details
    Browse the repository at this point in the history

  2. Revert "Comment out 3den Attributes until BIS properly solves http://… 

    …feedback.arma3.com/view.php?id=28031"

This reverts commit aea02af.
    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    ec88e4a View commit details
    Browse the repository at this point in the history

  3. Get the client ID from a new logic object

    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    0562446 View commit details
    Browse the repository at this point in the history

  4. Broadcast client

    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    f9ef100 View commit details
    Browse the repository at this point in the history

  5. Use the logic directly to determine client

    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    66fa188 View commit details
    Browse the repository at this point in the history

  6. Delete the logic and group after used

    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    b32732c View commit details
    Browse the repository at this point in the history

  7. Apply the same pattern to ACE_Markers

    @nicolasbadano
    nicolasbadano committed Feb 23, 2016
    Copy the full SHA
    b2c672e View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. Let this finally fix it please

    @nicolasbadano
    nicolasbadano committed Feb 24, 2016
    Copy the full SHA
    c6f6e4e View commit details
    Browse the repository at this point in the history

  2. Fix trace

    @nicolasbadano
    nicolasbadano committed Feb 24, 2016
    Copy the full SHA
    5af4e1c View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2016

  1. Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317 

    Conflicts:
	addons/medical/CfgEden.hpp
	addons/repair/CfgEden.hpp
    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    db4974e View commit details
    Browse the repository at this point in the history

  2. Redo markers, lost in the merge

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    849fa4f View commit details
    Browse the repository at this point in the history

  3. Debug stuff

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    834cbb4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    b9e1028 View commit details
    Browse the repository at this point in the history

  5. Fix event name typo

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    8280335 View commit details
    Browse the repository at this point in the history

  6. more fixes

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    823eb11 View commit details
    Browse the repository at this point in the history

  7. Yet more fixes

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    fba1a32 View commit details
    Browse the repository at this point in the history

  8. Filter the GVAR(explosivesOrientations) list before sending it

    @nicolasbadano
    nicolasbadano committed Feb 27, 2016
    Copy the full SHA
    188941a View commit details
    Browse the repository at this point in the history