Skip to content

/Cataclysm-BN forked from CleverRaven/Cataclysm-DDA

Permalink
Branch: experimental
Commits on Nov 14, 2017

  1. Merge branch 'master-cr' into experimental

    @Coolthulhu
    Coolthulhu committed Nov 14, 2017
    Loading status checks…
    4eeb5ad

  2. Merge remote-tracking branch 'origin/pr/22378'

    @kevingranade
    kevingranade committed Nov 14, 2017 
    * origin/pr/22378:
  Code fix.
  Also check name on Play No
  Get rid of annoying yes/no select world conformation.
  Prompt for already existing character name in current world.
    23c1512

  3. roll back some t_null handling, cursed static initialization order.

    @kevingranade
    kevingranade committed Nov 14, 2017
    0ed3db0

  4. Might make football fields appear more often or at all (CleverRaven#2…

    @SunshineDistillery @kevingranade
    SunshineDistillery authored and kevingranade committed Nov 14, 2017 
    …2376)
    c83b4f8

  5. Merge pull request CleverRaven#22396 from Velken/Velken-bug-fix-1

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 14, 2017 
    Correct PR for bug fix (Webbed + Tentacle Arms)
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    e612c48

  6. Merge remote-tracking branch 'origin/pr/22363'

    @kevingranade
    kevingranade committed Nov 14, 2017 
    * origin/pr/22363: (28 commits)
  Remove include of "map.h" from files that don't need it.
  Remove unused includes from "lightmap.cpp"
  Remove unused includes in "map.cpp"
  Remove include of "pathfinding.h" from "map.h"
  Remove include of "item.h" from "map.h" and add forward declarations.
  Remove unused include in "map.h".
  Replace include of "item.h" in "active_item_cache.h" with forward declaration.
  Move definition of item_stack::free_volume into the source file.
  Replace include of "emit.h" in "map.h" with forward declaration.
  Remove unused include of "mapgenformat.h" from "mapgen.h".
  Replace include of "mapdata.h" in "overmap.h" with forward declarations.
  Replace include of "omdata.h" in "mapgen_functions.h" with forward declarations.
  Replace include of "map.h" in "mapgen_functions.h" with forward declarations.
  Replace include of "mapdata.h" in "mapgen_functions.h" with forward declarations.
  Remove include of "mapdata.h" from "mapgen.h"
  Remove unused macro mfb from "mapdata.h".
  Remove unused includes from "mapdata.h"
  Replace include of "enums.h" from "mapdata.h" with forward declaration.
  Move include of "iexamine.h" from "mapdata.h" into the source file.
  Move include of "trap.h" from "mapdata.h" into source file.
  ...
    4deb1fb

  7. Clear map before executing furniture grab test. (CleverRaven#22356)

    @kevingranade
    kevingranade committed Nov 14, 2017
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    df38c29

  8. Un-hard code move speed calculations

    @Theundyingcode @kevingranade
    Theundyingcode authored and kevingranade committed Nov 14, 2017
    6b1c075
Commits on Nov 13, 2017

  1. Merge pull request CleverRaven#22384 from Coolthulhu/computer-mission…

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 13, 2017 
    …-fix

Fix mission name comparisons
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    7ee625d
Commits on Nov 12, 2017

  1. Merge pull request CleverRaven#22410 from Cyrano7/spaces

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 12, 2017 
    Fix sentence spacing for some new json entries
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    b59a875
Commits on Nov 11, 2017

  1. Fix sentence spacing for some new json entries

    @Cyrano7
    Cyrano7 committed Nov 11, 2017
    6c6dd0e

  2. Merge pull request CleverRaven#22390 from Tsunder/patch-10

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 11, 2017 
    add batch craft time modifiers to food processor recipes
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    8717a4c

  3. reduce improvised lockpick weight (CleverRaven#22405)

    @Tsunder @kevingranade
    Tsunder authored and kevingranade committed Nov 11, 2017 
    230g for an item with effectively 0 volume implies an extremely high density material.
    1aa6fcc
Commits on Nov 10, 2017

  1. Merge pull request CleverRaven#22400 from BrettDong/lang

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 10, 2017 
    i18n: Synchronized to the latest translations as of Nov 9, 2017
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    ce0f25b

  2. Merge pull request CleverRaven#22399 from BrettDong/template

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 10, 2017 
    i18n: Translation template update as of Nov 9, 2017
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    2d24c0b
Commits on Nov 9, 2017

  1. i18n: Translation template update as of Nov 9, 2017

    @BrettDong
    BrettDong committed Nov 9, 2017
    98d4539

  2. Supress 'no translatable string' warning from overmap_terrain.json

    @BrettDong
    BrettDong committed Nov 9, 2017
    6510b06

  3. i18n: Synchronized to the latest translations as of Nov 9, 2017

    @BrettDong
    BrettDong committed Nov 9, 2017
    eda259d

  4. Merge pull request CleverRaven#22391 from Cyrano7/joint

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 9, 2017 
    Fix lit joint in mapgen
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    118c940

  5. Correct PR for bug fix (Webbed + Tentacle Arms)

    @Velken
    Velken committed Nov 9, 2017 
    I am so sorry about the previous one ;-; I selected the wrong PR.
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    a9461ba
Commits on Nov 8, 2017

  1. Fix lit joint in mapgen

    @Cyrano7
    Cyrano7 committed Nov 8, 2017
    de83b0e

  2. Update recipe_food.json

    @Tsunder
    Tsunder committed Nov 8, 2017
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    823de07

  3. Merge pull request CleverRaven#22347 from BevapDin/mitemstack

    @OzoneH3
    OzoneH3 committed Nov 8, 2017 
    Move class map_item_stack into separate header and source files.
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    39ad053

  4. Merge pull request CleverRaven#22382 from Cyrano7/mm

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 8, 2017 
    Fix 7.62x25mm casing description
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    a8b3cc3

  5. Get rid of unused include, fix translation

    @Coolthulhu
    Coolthulhu committed Nov 8, 2017
    d45e1b0

  6. Translate mission name when printing, not loading

    @Coolthulhu
    Coolthulhu committed Nov 8, 2017
    7cd6936

  7. Fix prospectus and commo team name comparisons

    @Coolthulhu
    Coolthulhu committed Nov 8, 2017
    2d91aa7

  8. Fix computer action mission_complete

    @Coolthulhu
    Coolthulhu committed Nov 8, 2017
    07be25c
Commits on Nov 7, 2017

  1. Fix other instances

    @Cyrano7
    Cyrano7 committed Nov 7, 2017
    ebbb6c8

  2. Fix 7.72x25mm description

    @Cyrano7
    Cyrano7 committed Nov 7, 2017
    0e9d2b5

  3. Code fix.

    @OzoneH3
    OzoneH3 committed Nov 7, 2017
    38ff52b

  4. Also check name on Play No

    @OzoneH3
    OzoneH3 committed Nov 7, 2017
    1f2817f

  5. Get rid of annoying yes/no select world conformation.

    @OzoneH3
    OzoneH3 committed Nov 7, 2017
    1d4ad5a

  6. Prompt for already existing character name in current world.

    @OzoneH3
    OzoneH3 committed Nov 7, 2017
    89b7b38

  7. Merge pull request CleverRaven#22373 from svick/patch-1

    @Rivet-the-Zombie
    Rivet-the-Zombie committed Nov 7, 2017 
    Fixed open air tile in urban_8_2
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    06ecd06
Older
You can’t perform that action at this time.