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

Allow player to pick up frozen liquids #32763

Merged
merged 19 commits into from Aug 16, 2019

Commits on Jul 30, 2019

  1. llow player to pick frozen liquids

    Players should be able to chip or crush ice or other frozen liquids
    and pick them up and keep them in their inventory as long as they're
    frozen
    EddiTheBambi committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    5ba47ba View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2019

  1. Hammering 1 requirement for picking up frozen liquids

    Player can't scoop up solid ice with their hands, need something to chip off chunks with
    EddiTheBambi committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    c479e74 View commit details
    Browse the repository at this point in the history
  2. Fix astyle

    Missed astyle in last commit
    EddiTheBambi committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    3fafcb6 View commit details
    Browse the repository at this point in the history
  3. astyle - .astylerc

    Used default astyle options previously
    EddiTheBambi committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    64cf06c View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2019

  1. Frozen liquid can be stored in containers, translatablity

    Adding utility to the ability to pick up frozen liquids and fixing
    earlier traslation issues. There is still an issue relating to
    assigning AMMO to frozen liquids, functionality is there though game
    spits out an error message.
    EddiTheBambi committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    e8a2e5c View commit details
    Browse the repository at this point in the history
  2. Update src/pickup.cpp

    Co-Authored-By: Alexey Mostovoy <amurkin1988@yandex.ru>
    EddiTheBambi and Alexey Mostovoy committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    57cea4d View commit details
    Browse the repository at this point in the history
  3. Update src/pickup.cpp

    Co-Authored-By: Alexey Mostovoy <amurkin1988@yandex.ru>
    EddiTheBambi and Alexey Mostovoy committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    682cfe6 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2019

  1. Frozen liquids: advanced inventory, smash tile, popup changes

    Adds function item_with_best_of_quality() to player.h to smash tile
    with correct tool. Includes advanced inventory support and minor
    changes to popup clarity and wording
    EddiTheBambi committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    00f001b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2019

  1. Merge from master

    EddiTheBambi committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    06afb22 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2019

  1. Prompt user on reload, function separation, string fixes

    Suggestions from @BevapDin, finishing functionality
    EddiTheBambi committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    181d996 View commit details
    Browse the repository at this point in the history
  2. Correct typo, clean up params, function comments, fix reload bug

    There was previously an accidental typo in player.h, it is now fixed
    Removed redundant parameter to crush_frozen_liquid()
    Changed function comments on suggestion of @AMurkin
    There was a bug where items reloaded after frozen liquid logic wouldn't
    reload, this has now been resolved.
    EddiTheBambi committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    b32a2d9 View commit details
    Browse the repository at this point in the history
  3. Update src/player.cpp

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    EddiTheBambi and BevapDin committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    a99deca View commit details
    Browse the repository at this point in the history
  4. Update src/player.cpp

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    EddiTheBambi and BevapDin committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    d1baf04 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2019

  1. Update src/player.h

    Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
    EddiTheBambi and ZhilkinSerg committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    7453491 View commit details
    Browse the repository at this point in the history
  2. Update player.cpp

    EddiTheBambi committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    2a2100f View commit details
    Browse the repository at this point in the history
  3. Merge with remote

    EddiTheBambi committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    de7f89c View commit details
    Browse the repository at this point in the history
  4. Update src/player.h

    Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
    EddiTheBambi and ZhilkinSerg committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    17f8177 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    401e67e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    399806c View commit details
    Browse the repository at this point in the history