Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into autopickup
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Auto pickup preparations for characterspecific rules and options
Merge branch 'autopickup' of https://github.com/OzoneH3/Cataclysm-DDA into autopickup
use -lSDL, -lSDL_ttf or frameworks for osx
edit
Fixed typos for floatation_vest armor id/name
Fixed typos for floatation_vest tag "FLOATATION" and references to it in game::vertical_move(...) and player::swim_speed(...)
Stupid additional typo...
Auto pickup with characterspecific rules. Advanced rules matching with * wildcard.
Merge branch 'autopickup' of https://github.com/OzoneH3/Cataclysm-DDA into autopickup
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Added funktion to test all items against a rule and see the matching results.
Added iuse function for absorbant materials, namely towels, so that the player can dry themself. Adds morale bonus for going from wet->dry
typo in morale modifier name
... and left off the c_str() on the messages. Fixed now.
tighten up howto
Update COMPILING_osx.md
Update COMPILING_osx.md
edit