Skip to content

/DDAtase forked from CleverRaven/Cataclysm-DDA

Permalink
Branch: lazycat
Commits on Mar 15, 2013

  1. Merge remote-tracking branch 'upstream/master' into lazycat

    @philippeop
    philippeop committed Mar 15, 2013 
    Conflicts:
	iuse.cpp
    dc9f855

  2. Added fur to waterskins, because it's basically leather anyway.

    @TheDarklingWolf
    TheDarklingWolf committed Mar 15, 2013
    8d86aea

  3. Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm…

    @TheDarklingWolf
    TheDarklingWolf committed Mar 15, 2013 
    …-DDA
    f198557

  4. Merge pull request CleverRaven#213 from fs0/master

    @TheDarklingWolf
    TheDarklingWolf committed Mar 15, 2013 
    spelling error in pldata.h
    35d3036

  5. Fixed spelling error: received

    @fs0
    fs0 committed Mar 15, 2013
    70078c3

  6. Add toolset to primitive crafts. Also made the needle use the knives …

    @TheDarklingWolf
    TheDarklingWolf committed Mar 15, 2013 
    …toolgroup.
    f00e5f1

  7. Fixed reinforced tag on fitted boots. You can now discard unwanted sk…

    @TheDarklingWolf
    TheDarklingWolf committed Mar 15, 2013 
    …illpoints at chargen
    77d5413

  8. Merge pull request CleverRaven#212 from Shoes01/master

    @OzoneH3
    OzoneH3 committed Mar 15, 2013 
    Bodytemp code moved to player.cpp
    8962523

  9. Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA

    @Shoes01
    Shoes01 committed Mar 15, 2013
    d3a06a6

  10. Merge pull request CleverRaven#209 from iank/kill_screen

    @OzoneH3
    OzoneH3 committed Mar 15, 2013 
    View kill stats in-game
    81d3238

  11. Merge pull request CleverRaven#211 from Catacstone/human_meat_morale

    @OzoneH3
    OzoneH3 committed Mar 15, 2013 
    Cannibalism-induced morale status shift fix
    83a6d67

  12. Merge pull request CleverRaven#210 from tasetase/quickfix

    @OzoneH3
    OzoneH3 committed Mar 15, 2013 
    Quick fix for windows size
    e1f6479

  13. Cannibalism-induced morale status shift fix

    @Catacstone
    Catacstone committed Mar 15, 2013
    e2d43e8

  14. Quick fix for windows size

    @philippeop
    philippeop committed Mar 15, 2013
    8b41504

  15. Proper terminal dimensions for death screen

    Your Name
    Your Name committed Mar 15, 2013
    5b8c834

  16. View kill stats in-game

    Your Name
    Your Name committed Mar 15, 2013 
    Someone already wrote this disp_kills routine, but it was dead code;
I deduplicated the end-game kill stats screen and bound it to a key:
')' by default.
    036915d
Commits on Mar 14, 2013

  1. Centered Help and Options menu and added a border.

    @OzoneH3
    OzoneH3 committed Mar 14, 2013
    7a2a867

  2. Spelling fix: Taekwondo

    @OzoneH3
    OzoneH3 committed Mar 14, 2013
    3d98b24

  3. Minor Tweaks: Support larger terminals automatically

    @OzoneH3
    OzoneH3 committed Mar 14, 2013 
    Make sure Terrain width/height are uneven
Readded windows viewport options
    f30d750

  4. Merge pull request CleverRaven#193 from iank/terminal_size

    @OzoneH3
    OzoneH3 committed Mar 14, 2013 
    Support larger terminals automatically
    9eeb13e

  5. Merge pull request CleverRaven#206 from jbfink/spelling-fix

    @TheDarklingWolf
    TheDarklingWolf committed Mar 14, 2013 
    spelling fix in iuse.cpp
    b332515

  6. spelling fix in iuse.cpp

    @jbfink
    jbfink committed Mar 14, 2013
    cc34401

  7. Long underwear no longer have storage

    @Shoes01
    Shoes01 committed Mar 14, 2013
    940aad4

  8. Moved bodytemp code to player.cpp and uncommented update_bodytemp

    @Shoes01
    Shoes01 committed Mar 14, 2013
    628db6b

  9. Merge pull request CleverRaven#202 from Catacstone/lockpick_breakage

    @kevingranade
    kevingranade committed Mar 14, 2013 
    Lockpicks break more properly now
    1634bd2

  10. Merge pull request CleverRaven#199 from Catacstone/hospital_map

    @kevingranade
    kevingranade committed Mar 14, 2013 
    Hospital maps
    f6db41d
Commits on Mar 13, 2013

  1. Unneeded i_rem removal

    @Catacstone
    Catacstone committed Mar 13, 2013
    8409ca7

  2. Lockpicks break more properly now

    @Catacstone
    Catacstone committed Mar 13, 2013
    d998849

  3. Hospital maps

    @Catacstone
    Catacstone committed Mar 12, 2013
    ff333bd

  4. Merge remote-tracking branch 'upstream/master' into lazycat

    @philippeop
    philippeop committed Mar 13, 2013
    484db86

  5. Fixed cake spawn

    @TheDarklingWolf
    TheDarklingWolf committed Mar 13, 2013
    96f94ac

  6. Added cake, some new weapons, replaced Heartless with cannibal, new

    @TheDarklingWolf
    TheDarklingWolf committed Mar 13, 2013 
    morale penalty for eating human meat.
    a48333b

  7. More changelog, updated makefile version number

    @TheDarklingWolf
    TheDarklingWolf committed Mar 13, 2013
    7a41e10

  8. Added a changelog

    @TheDarklingWolf
    TheDarklingWolf committed Mar 13, 2013
    3d40c71

  9. Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm…

    @TheDarklingWolf
    TheDarklingWolf committed Mar 13, 2013 
    …-DDA
    5bed383
Older
You can’t perform that action at this time.