summaryrefslogtreecommitdiff
path: root/resources
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'test'Japa2012-08-241-0/+0
|\
| * changed default creature sprite behavior to show a creature's letter instead ↵Japa2012-08-241-0/+0
| | | | | | | | of a purple question mark.
* | Merge branch 'master' of https://github.com/JapaMala/stonesenseJapa2012-08-241-2/+2
|\ \ | |/ |/| | | | | | | Conflicts: MapLoading.cpp resources/buildings/Craftsdwarfs.xml
| * Tidied up some error messages, fixed some sprites.Japa2012-08-201-1/+1
| | | | | | | | | | | | Non-errors are now put into verbose logging, because end-users don't need to see that stuff. Also fixed a few other things.
* | Merge https://github.com/Caldfir/stonesensePetr Mrázek2012-06-1323-770/+769
|\ \
| * | Switched large sprites to 128px form factor.Caldfir2012-05-2623-770/+769
| | |
* | | Material variants for hatches.8Z2012-05-307-20/+116
| | | | | | | | | | | | Glass tables, chairs, cabinets, chest.
* | | Grayscaled vertical bars.8Z2012-05-272-16/+14
| | |
* | | Objects.png tweaking:8Z2012-05-2712-39/+82
| | | | | | | | | | | | | | | | | | Some sprites were mispositioned (cut-off pixels and such). Grayscaled cage, wall grates, and archery target. Type-based trap variants + animal trap.
* | | Some creature sprites from old Stonesense thread and humans tiles tweaking.8Z2012-05-277-43/+206
| | |
* | | Halftile-variants for liquds that prevent their blending with trunkated walls.8Z2012-05-271-24/+42
| | |
* | | New river and pool ramps8Z2012-05-272-3/+23
| | |
* | | Typos8Z2012-05-273-3/+3
|/ /
* | Updated animal spritesheets.unknown2012-05-1511-91/+138
| |
* | Added basic job icon support (very placeholderish icons).Caldfir2012-04-221-0/+0
| |
* | Merge https://github.com/peterix/stonesenseCaldfir2012-04-175-0/+7
|\ \
| * \ Merge https://github.com/Caldfir/stonesensePetr Mrázek2012-04-164-0/+562
| |\ \
| * | | Nuke Thumbs.dbPetr Mrázek2012-04-112-0/+1
| | |/ | |/|
| * | Merge branch 'master' of https://github.com/Caldfir/stonesenseJapa Illo2012-04-123-7/+7
| |\ \
| * \ \ Merge branch 'master' of https://github.com/Caldfir/stonesenseJapa Illo2012-04-106-3/+112
| |\ \ \
| * \ \ \ Merge https://github.com/JapaMala/stonesensePetr Mrázek2012-04-054-0/+6
| |\ \ \ \
| | * | | | Fixed item subtypes, made creature happiness only show on dwarves.Japa Illo2012-04-054-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
* | | | | | Finished off the set of weapons, some headgear modifications and stray pixel ↵Caldfir2012-04-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | cleanup.
* | | | | | Added in the individual spritework by NW_Kohaku.Caldfir2012-04-161-0/+0
| |_|_|_|/ |/| | | |
* | | | | Cleaned up stray pixels.Caldfir2012-04-152-0/+0
| | | | |
* | | | | Updated sprite sheets with most weapons, some shields.Caldfir2012-04-143-0/+562
| | | | |
* | | | | no thumbsCaldfir2012-04-141-0/+0
| | | | |
* | | | | Attempt at getting dye blending to work.Caldfir2012-04-141-0/+0
| | | | |
* | | | | Updated profession indicator to use slightly smaller icons, increased icon ↵Caldfir2012-04-111-0/+0
| | | | | | | | | | | | | | | | | | | | contrast.
* | | | | Updated clothing sprite sheets for colour consistency.Caldfir2012-04-112-0/+0
| |_|_|/ |/| | |
* | | | herp derpCaldfir2012-04-101-0/+0
| | | |
* | | | Fixed the xml to permit female dwarf military hair again XDCaldfir2012-04-101-3/+3
| | | |
* | | | Clothed dwarves now show hoods beneath helms.Caldfir2012-04-102-4/+4
| |_|/ |/| |
* | | Finished the new female dwarven clothes sprites! (finally)Caldfir2012-04-104-1/+1
| | |
* | | Added preliminary version of clothed female dwarves.Caldfir2012-04-055-3/+112
| | |
* | | Renamed erroneously named 'job' variables to correctly read 'profession'.Caldfir2012-04-051-0/+0
| | |
* | | Made icons for military/misc professions.Caldfir2012-04-011-0/+0
|/ /
* | Merge https://github.com/JapaMala/stonesensePetr Mrázek2012-03-312-6/+6
|\ \ | |/
| * Made a few more items color by material.Japa Illo2012-03-302-6/+6
| | | | | | | | Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
* | Turn off debug mode for release.Petr Mrázek2012-03-291-1/+1
|/
* Merge branch 'master' of https://github.com/Caldfir/stonesenseJapa Illo2012-03-272-1303/+111
|\ | | | | | | | | | | | | | | | | Conflicts: BlockCondition.cpp ContentLoader.cpp GUI.cpp MapLoading.cpp SpriteObjects.cpp
| * Made the profession sheet actually partially representative of different ↵Caldfir2012-03-261-0/+0
| | | | | | | | professions.
| * Updated stuff, and added in a 'Military' special attribute to the creature ↵Caldfir2012-03-243-1305/+113
| | | | | | | | configuration.
| * Added in a placeholder profession sheet.Caldfir2012-03-241-0/+0
| |
* | Put in sprites for all the items, also made errors go to the console.Japa Illo2012-03-266-18/+85
| | | | | | | | Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
* | Added configurable sprite support for items on the floor.Japa Illo2012-03-266-0/+19
| | | | | | | | Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
* | Merge branch 'master' of https://github.com/Caldfir/stonesenseJapa Illo2012-03-233-32/+1285
|\ \ | |/
| * Fixed more cape strangeness.Caldfir2012-03-212-0/+0
| |
| * Fixed some goofiness with capes and cloaks and capes, and removed some ↵Caldfir2012-03-212-0/+0
| | | | | | | | leftover pixels from construction.
| * Made the agressive (military) dwarf sprites and associated xml.Caldfir2012-03-203-32/+1285
| |