Skip to content

/Cataclysm-DDA

Permalink
Branch: master
Commits on Apr 18, 2015

  1. Missed a spot.

    @KA101
    KA101 committed Apr 18, 2015
    0eb935b
Commits on Apr 17, 2015

  1. Fix something I missed.

    @KA101
    KA101 committed Apr 17, 2015 
    Sorry about that, all.
    984d098

  2. Missing paren.

    @KA101
    KA101 committed Apr 17, 2015 
    Happened to me more than I care to admit, no big.
    c8382e1

  3. Merge branch 'Tinfoil' of https://github.com/i2amroy/Cataclysm-DDA in…

    @KA101
    KA101 committed Apr 17, 2015 
    …to yetanothermerge
    d2f7d3f

  4. Merge pull request #12014 from Darkyhard/chemistry

    @KA101
    KA101 committed Apr 17, 2015 
    Chemistry recipes tweaks.
    55a9ef9

  5. Merge pull request #12043 from Rivet-the-Zombie/ags-nix

    @KA101
    KA101 committed Apr 17, 2015 
    Remove extraneous .json.
    8f7cb3a
Commits on Apr 16, 2015

  1. Merge pull request #12038 from facepalm/FixMultipleAmmo

    @KA101
    KA101 committed Apr 16, 2015 
    Fix ammo reload dialog
    141954b

  2. Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

    @KA101
    KA101 committed Apr 16, 2015
    705f7f1

  3. simple

    @KA101
    KA101 committed Apr 16, 2015
    8ecce06

  4. Merge branch 'ConstructionTweaks' of https://github.com/facepalm/Cata…

    @KA101
    KA101 committed Apr 16, 2015 
    …clysm-DDA into merge3-a
    d5b05e3

  5. Merge branch 'inventory-symbols' of https://github.com/brezerk/Catacl…

    @KA101
    KA101 committed Apr 16, 2015 
    …ysm-DDA into merge3-a
    c888d7d

  6. Merge branch 'fix-my-fix' of https://github.com/PropaneSoup/Cataclysm…

    @KA101
    KA101 committed Apr 16, 2015 
    …-DDA into merge3-a
    f3d4ac2

  7. Merge branch 'fif' of https://github.com/BevapDin/Cataclysm-DDA into …

    @KA101
    KA101 committed Apr 16, 2015 
    …merge3-a
    05d19d5

  8. Merge branch 'gor' of https://github.com/BevapDin/Cataclysm-DDA into …

    @KA101
    KA101 committed Apr 16, 2015 
    …merge3-a
    b51f6b0
Commits on Apr 15, 2015

  1. Merge pull request #12030 from Rivet-the-Zombie/fixes

    @KA101
    KA101 committed Apr 15, 2015 
    Spacing and grammar fixes: iuse.cpp.
    934a8d2

  2. Merge pull request #12036 from Chezzo/MonstersCansBagsBoxes

    @KA101
    KA101 committed Apr 15, 2015 
    Monsters are done!
    91735ec

  3. Merge branch 'ConstructionTimeScaling' of https://github.com/facepalm…

    @KA101
    KA101 committed Apr 15, 2015 
    …/Cataclysm-DDA into buildtime
    b95bcaa

  4. Tweaks & tab-removal.

    @KA101
    KA101 committed Apr 15, 2015
    4fbd61e

  5. Merge branch 'necro-lore' of https://github.com/Frost-wood/Cataclysm-DDA

    @KA101
    KA101 committed Apr 15, 2015 
     into merge2
    d046390

  6. Merge branch 'bip' of https://github.com/BevapDin/Cataclysm-DDA into …

    @KA101
    KA101 committed Apr 15, 2015 
    …merge2
    03475f3

  7. Merge branch 'head-encumb-fix' of https://github.com/PropaneSoup/Cata…

    @KA101
    KA101 committed Apr 15, 2015 
    …clysm-DDA into merge2
    9a5d13f

  8. Merge branch 'flag-clean' of https://github.com/Coolthulhu/Cataclysm-DDA

    @KA101
    KA101 committed Apr 15, 2015 
     into merge2
    7433367

  9. Merge branch 'scentfix' of https://github.com/Coolthulhu/Cataclysm-DDA …

    @KA101
    KA101 committed Apr 15, 2015 
    …into merge2
    b54f280

  10. Merge branch 'fix-curses-draw-artifacts' of https://github.com/keving…

    @KA101
    KA101 committed Apr 15, 2015 
    …ranade/Cataclysm-DDA into merge2
    44c9d72
Commits on Apr 14, 2015

  1. Merge branch 'zlev-option' of https://github.com/Coolthulhu/Cataclysm…

    @KA101
    KA101 committed Apr 14, 2015 
    …-DDA into merge-b
    24fe0e0

  2. Merge branch 'plants' of https://github.com/Darkyhard/Cataclysm-DDA i…

    @KA101
    KA101 committed Apr 14, 2015 
    …nto merge-b
    bc261cd

  3. Merge branch 'new-lightmap-refactor' of https://github.com/kevingrana…

    @KA101
    KA101 committed Apr 14, 2015 
    …de/Cataclysm-DDA into merge-b
    d6fdcb0

  4. Merge branch 'brake-fix' of https://github.com/Coolthulhu/Cataclysm-DDA…

    @KA101
    KA101 committed Apr 14, 2015 
    … into merge-b
    5b73ab2

  5. Merge branch 'Radio' of https://github.com/i2amroy/Cataclysm-DDA into…

    @KA101
    KA101 committed Apr 14, 2015 
    … merge-b
    ffb5f51

  6. Merge branch 'BlockEffects' of https://github.com/i2amroy/Cataclysm-DDA…

    @KA101
    KA101 committed Apr 14, 2015 
    … into merge-b
    d717383

  7. Merge pull request #12006 from Rivet-the-Zombie/smaaaash

    @KA101
    KA101 committed Apr 14, 2015 
    Fixes indestructible diesel pumps.
    213a13e
Commits on Apr 12, 2015

  1. Builfdix: peg an initial value on next_ter

    @KA101
    KA101 committed Apr 12, 2015 
    Hoping this fixes it.
    2
    152deb5

  2. Merge pull request #11950 from facepalm/PermanentUnderbrush

    @KA101
    KA101 committed Apr 12, 2015 
    Permanent underbrush
    2cca6c9

  3. Merge pull request #11977 from KiwiTrinsic/hardware_stores

    @KA101
    KA101 committed Apr 12, 2015 
    Adding two json mapgen variations for hardware stores
    323edf0

  4. Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

    @KA101
    KA101 committed Apr 12, 2015
    9a65110
Older
You can’t perform that action at this time.