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

(ready) Quick swap weapons and hotkey #401

Merged
merged 35 commits into from
Jul 19, 2018
Merged

(ready) Quick swap weapons and hotkey #401

merged 35 commits into from
Jul 19, 2018

Commits on May 24, 2018

  1. Merge pull request #24 from Attnam/master 

    update from main
    @AquariusPower
    AquariusPower authored May 24, 2018
    Configuration menu
    Copy the full SHA
    15d64ae View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. Merge pull request #25 from Attnam/master 

    (ready) New monsters (Attnam#349)
    @AquariusPower
    AquariusPower authored May 28, 2018
    Configuration menu
    Copy the full SHA
    99ef7d6 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2018

  1. Merge pull request #26 from Attnam/master 

    update from main
    @AquariusPower
    AquariusPower authored May 29, 2018
    Configuration menu
    Copy the full SHA
    af8c444 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. Merge pull request #27 from Attnam/master 

    (ready) bug fix for show items under (Attnam#369)
    @AquariusPower
    AquariusPower authored May 30, 2018
    Configuration menu
    Copy the full SHA
    9979cf8 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Merge pull request #28 from Attnam/master 

    (ready) Fantasy name generator (Attnam#363)
    @AquariusPower
    AquariusPower authored May 31, 2018
    Configuration menu
    Copy the full SHA
    8714ec6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29 from Attnam/master 

    update from main
    @AquariusPower
    AquariusPower authored May 31, 2018
    Configuration menu
    Copy the full SHA
    47044b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. Merge branch 'master' of https://github.com/Attnam/ivan into Attnam-m… 

    …aster
    @AquariusPower
    AquariusPower committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    b4be00e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Attnam/ivan into Attnam-m… 

    …aster
    @AquariusPower
    AquariusPower committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    a5387b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2018

  1. Merge branch 'master' of https://github.com/Attnam/ivan into Attnam-m… 

    …aster
    @AquariusPower
    AquariusPower committed Jun 9, 2018
    Configuration menu
    Copy the full SHA
    b10b0c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. quick swap weapons and hotkey

    @AquariusPower
    AquariusPower committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    df3b64b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into QuickSwapWeapons

    @AquariusPower
    AquariusPower authored Jun 11, 2018
    Configuration menu
    Copy the full SHA
    d8d900e View commit details
    Browse the repository at this point in the history

  3. fix missing dbgmsg include

    @AquariusPower
    AquariusPower committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    cf02638 View commit details
    Browse the repository at this point in the history

  4. quickswap: added option to directly change to specific config

    @AquariusPower
    AquariusPower committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    6e5e6bf View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2018

  1. quickSwap: shows item's gfx now

    @AquariusPower
    AquariusPower committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    97eb626 View commit details
    Browse the repository at this point in the history

  2. quickSwap: fixed actions on list

    @AquariusPower
    AquariusPower committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    3fb300b View commit details
    Browse the repository at this point in the history

  3. listItem: added zoom to engrave item mode 

    quickSwap: shows zoomed silhouette on config mode
    @AquariusPower
    AquariusPower committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    269fe66 View commit details
    Browse the repository at this point in the history

  4. quickSwap: 

    - added list maintenance options (remove, undo, move)
- improved list coloring
- fixed simple swapping
- dead commented code cleanup
    @AquariusPower
    AquariusPower committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    be8946d View commit details
    Browse the repository at this point in the history

  5. added game::ValidateCommandKeys() to prevent conflicts on setting new… 

    … command keys.

changed wizard key to '`' and quickswap to 'x' and 'X'
    @AquariusPower
    AquariusPower committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    8eb4cd5 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. dbgmsgproj.h: improved usage

    @AquariusPower
    AquariusPower committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    1c15714 View commit details
    Browse the repository at this point in the history

  2. dbgmsgproj.h: improved usage

    @AquariusPower
    AquariusPower committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    9cced51 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. Merge branch 'master' of https://github.com/Attnam/ivan into Attnam-m… 

    …aster
    @AquariusPower
    AquariusPower committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    a22d8c7 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2018

  1. Merge branch 'Attnam-master' into QuickSwapWeapons

    @AquariusPower
    AquariusPower committed Jun 16, 2018
    Configuration menu
    Copy the full SHA
    680c0c2 View commit details
    Browse the repository at this point in the history

  2. quick swap weapons: fix if polymorphed into a ghost

    @AquariusPower
    AquariusPower committed Jun 16, 2018
    Configuration menu
    Copy the full SHA
    3d5616b View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2018

  1. swap weapons: new option to swap the arms for the weapons 

    sfx fixes: vomit and magic whistle
    @AquariusPower
    AquariusPower committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    ec9342b View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. fixed swap weapons to clean the list from empties and in case any wea… 

    …pon is invalid based on the consistent list

fixed hiteffect to check for character/item existance using the consistent list
    @AquariusPower
    AquariusPower committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    42c3c2d View commit details
    Browse the repository at this point in the history

  2. fixed wrong merge (should be at craft branch)

    @AquariusPower
    AquariusPower committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    013d713 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into QuickSwapWeapons

    @AquariusPower
    AquariusPower authored Jun 19, 2018
    Configuration menu
    Copy the full SHA
    0ce8f54 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. Merge branch 'master' into QuickSwapWeapons

    @AquariusPower
    AquariusPower authored Jun 28, 2018
    Configuration menu
    Copy the full SHA
    a97a04f View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2018

  1. added the missing BitmapPos vial cfg to item.dat

    @AquariusPower
    AquariusPower committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    cb3812c View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2018

  1. SavegameSafely defaults to true now

    @AquariusPower
    AquariusPower committed Jul 8, 2018
    Configuration menu
    Copy the full SHA
    f62f82a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. swap weapons: 

    - fixed crash if config had a broken weapon that was fixed by blacksmith
- improved swapping to make it sure what is the current config before applying next one
    @AquariusPower
    AquariusPower committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    de8527b View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. swap weapons: fix abort msg

    @AquariusPower
    AquariusPower committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    ffcb024 View commit details
    Browse the repository at this point in the history

  2. hiteffect: making it sure item ID hitting is consistent

    @AquariusPower
    AquariusPower committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    1dbb0b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2018

  1. moved swap weapons code to a .cpp file

    @AquariusPower
    AquariusPower committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    eaac215 View commit details
    Browse the repository at this point in the history

  2. removed dup swap weap code

    @AquariusPower
    AquariusPower committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    08ceb8c View commit details
    Browse the repository at this point in the history