Commits on May 23, 2016

  1. Fix bug with critical hit chance calculation

    Crispy6 committed May 23, 2016

Commits on May 26, 2016

  1. add msvc140 cache files into gitignore

    DLaboratory committed May 26, 2016
  2. fix constant integer array issue with MSVC in input.cpp

    DLaboratory committed May 26, 2016

Commits on May 27, 2016

  1. solve almost all compile errors with msvc

    DLaboratory committed May 27, 2016
  2. write compiling guide for visual studio

    DLaboratory committed May 27, 2016
  3. add SDL into msvc compiling guide

    DLaboratory committed May 27, 2016

Commits on May 28, 2016

  1. add comment and fix the typo

    DLaboratory committed May 28, 2016
  2. astyle explosion.cpp and output.cpp/h

    DLaboratory committed May 28, 2016
  3. fix min(pow(x,x),x) build error with gcc

    Original code:
    std::min(std::pow(0.8f, dis_item.damage), 1.0);
    results in compile error with msvc.
    
    Then, I edit it to
    std::min(std::pow(0.8f, dis_item.damage), 1.0f);
    then in Visual Studio, the code passes to build.
    But in GCC, there is a compile error.
    
    Finally, I edit it to
    (float)(std::min(std::pow(0.8, dis_item.damage), 1.0))
    DLaboratory committed May 28, 2016
  4. write localization guide with msvc

    DLaboratory committed May 28, 2016

Commits on May 29, 2016

  1. astyle code format

    DLaboratory committed May 29, 2016
  2. astyle code format for all files I changed

    DLaboratory committed May 29, 2016
  3. msvc optimization flags tune

    DLaboratory committed May 29, 2016
  4. Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

    …into melee_critical_hit_bugfix
    Crispy6 committed May 29, 2016

Commits on May 30, 2016

  1. add mischief to SIGNOFF

    mischief committed May 30, 2016
  2. fix reset_special_rng argument in shadow trapfunc

    passing 0 produces a std::logic_error: 'basic_string::_S_construct null not valid'
    mischief committed May 30, 2016
  3. When choosing a stackable item in the pick up menu, account for items…

    … of that type already in the player's inventory when calculating the projected volume.
    sethsimon authored and kevingranade committed May 30, 2016
  4. Account for stackable items when determining the projected volume.

    Adds a helper function in the pickup class that changes the projected volume depending on whether the item is stackable or not and if any of that item is in the player's inventory.
    sethsimon authored and kevingranade committed May 30, 2016
  5. Fixed compilation issue

    epsilon-phase authored and kevingranade committed May 30, 2016
  6. Use a copy of the player to track projected weight and volume.

    Add a position field in struct pickup_count; this field is used by Pickup::pick_up to keep track of the position of the item in the copy of the player's inventory.
    sethsimon authored and kevingranade committed May 30, 2016
  7. Restore pickup.h to how it was (I thought I did that already, but app…

    …arently I didn't)
    sethsimon authored and kevingranade committed May 30, 2016
  8. Reverted Makefile

    epsilon-phase authored and kevingranade committed May 30, 2016
  9. Merge remote-tracking branch 'origin/pr/16847'

    * origin/pr/16847:
      Fix bug with critical hit chance calculation
    kevingranade committed May 30, 2016
  10. Merge remote-tracking branch 'origin/pr/16889'

    Very minor restyling with merge.
    
    * origin/pr/16889:
      msvc optimization flags tune
      astyle code format for all files I changed
      astyle code format
      write localization guide with msvc
      use unicode escape character to represent single char '…'
      fix min(pow(x,x),x) build error with gcc
      astyle explosion.cpp and output.cpp/h
      add comment and fix the typo
      add SDL into msvc compiling guide
      write compiling guide for visual studio
      solve almost all compile errors with msvc
      fix constant integer array issue with MSVC in input.cpp
      add msvc140 cache files into gitignore
    kevingranade committed May 30, 2016
  11. Keep terminal and oversized framebuffers at the same size to prevent

    crashes from other windows using the oversized dimensions in the terminal
    buffer.
    DanmakuDan committed May 30, 2016
  12. Merge remote-tracking branches 'origin/pr/16950' and 'origin/pr/16953'

    * origin/pr/16950:
      fix reset_special_rng argument in shadow trapfunc
      add mischief to SIGNOFF
    
    * origin/pr/16953:
      Keep terminal and oversized framebuffers at the same size to prevent crashes from other windows using the oversized dimensions in the terminal buffer.
      Fix crash case where hit animations are used with custom fonts.
      Undo the refresh after the uimenu window is closed.
    kevingranade committed May 30, 2016