Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into autopickup
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
Auto pickup with characterspecific rules. Advanced rules matching with * wildcard.
Merge branch 'autopickup' of https://github.com/OzoneH3/Cataclysm-DDA into autopickup
Added funktion to test all items against a rule and see the matching results.
tighten up howto
Update COMPILING_osx.md
Update COMPILING_osx.md
edit
Merge branch 'osx' of https://github.com/mattkelr/Cataclysm-DDA into osx
Autopickup rules are now case insensitive.
Gihub, the best site for all your gi needs
JSONize container templates.
Base power production from solar panels on sunlight at the panel's location instead of the vehicle origin, and ignore vehicle roof.
Towel function, typo corrections, container JSONification, and MAC compile fixes.
Merge autopickup improvements.
Remove redundant default argument assignment to make Clang happy.