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

Autoequip hotkey in inventory screen #941

Merged
merged 8 commits into from Jan 2, 2016
Merged

Autoequip hotkey in inventory screen #941

merged 8 commits into from Jan 2, 2016

Commits on Sep 4, 2014

  1. add 'z' hotkey to autoequip current unit

    @myk002
    myk002 committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    23ab356 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into autoequip_hotkey

    @myk002
    myk002 committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    fc608c5 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2014

  1. Merge remote-tracking branch 'upstream/master' into autoequip_hotkey 

    Conflicts:
	src/Battlescape/BattlescapeGenerator.cpp
    @myk002
    myk002 committed Sep 7, 2014
    Configuration menu
    Copy the full SHA
    0721dd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. Merge remote-tracking branch 'upstream/master' into autoequip_hotkey

    @myk002
    myk002 committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    c64749c View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2014

  1. Merge remote-tracking branch 'upstream/master' into autoequip_hotkey 

    Conflicts:
	src/Battlescape/BattlescapeGenerator.cpp
	src/Battlescape/BattlescapeGenerator.h
    @myk002
    myk002 committed Nov 21, 2014
    Configuration menu
    Copy the full SHA
    455584f View commit details
    Browse the repository at this point in the history

  2. fix merge error

    @myk002
    myk002 committed Nov 21, 2014
    Configuration menu
    Copy the full SHA
    9d98be2 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2015

  1. Merge remote-tracking branch 'origin/master' into autoequip_hotkey 

    Conflicts:
	src/Battlescape/BattlescapeGenerator.cpp
	src/Battlescape/InventoryState.cpp
    @myk002
    myk002 committed Apr 3, 2015
    Configuration menu
    Copy the full SHA
    8c92440 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2015

  1. Merge remote-tracking branch 'upstream/master' into autoequip_hotkey

    @myk002
    myk002 committed May 7, 2015
    Configuration menu
    Copy the full SHA
    63900c1 View commit details
    Browse the repository at this point in the history