summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-11-28Fix some map bugsJared Adams3-18/+11
2008-11-25Merge branch 'master' of git@gitorious.org:tmwdata/mainlineJared Adams9-5/+212
2008-11-25Fix another warpJared Adams1-1/+1
2008-11-24Added miner graphics, fixed npcs.xmlFate2-3/+4
2008-11-24Fixed some particle effectsFate3-39/+13
2008-11-24Added three new NPC graphicsFate2-0/+3
2008-11-23Merge branch 'master' into magicFate10-37/+60
2008-11-23Fix some warpsJared Adams1-3/+3
2008-11-23A spelling fixJared Adams1-2/+2
2008-11-23Another bad warpJared Adams1-2/+2
2008-11-23Fix a bad warp.Jared Adams2-2/+2
2008-11-23Fix another bad warp.Jared Adams1-1/+1
2008-11-23Merge branch 'master' of git@gitorious.org:tmwdata/mainlineJared Adams5-4/+18
2008-11-23Merge branch 'map-renaming'Fate5-4/+18
2008-11-23Merge branch 'map-renaming' of git@gitorious.org:tmwdata/mainline into ↵Fate5-99/+17
map-renaming
2008-11-23Misc fixesFate6-4/+19
2008-11-23Fix collision tiles on 011-4Jared Adams1-7/+7
2008-11-23Fix some map bugsJared Adams2-10/+11
2008-11-23Fix a few map bugsJared Adams3-8/+16
2008-11-23Merge branch 'master' into magicFate112-1037/+3164
2008-11-23Merge branch 'real-master' into fresh-masterFate68-71/+391
Conflicts: graphics/sprites/head-deserthat.xml
2008-11-23Merge branch 'map-renaming' into real-masterFate68-82/+402
Conflicts: graphics/items/armor-head-standardheadband.png graphics/sprites/item007.png monsters.xml
2008-11-22Merge branch 'master' of git@gitorious.org:tmwdata/mainlineFate1-91/+0
2008-11-22Merge branch 'master' of git@gitorious.org:tmwdata/mainlineFate51-949/+2715
2008-11-22Update some filesJared Adams5-99/+17
2008-11-22Remove 002-2 againJared Adams1-91/+0
2008-11-22Fix number of Jack O SoulJared Adams1-4/+2
2008-11-22Merge branch 'master' of git@gitorious.org:tmwdata/mainlineJared Adams4-5/+139
2008-11-22Removed drop shadow from Mouboo headScott Ellis1-0/+0
Item icons are not supposed to have a dropshadow.
2008-11-22Merge commit 'origin/map-renaming'Jared Adams46-944/+2701
2008-11-22Update some mapsJared Adams3-19/+339
2008-11-22Add Jack O SoulJared Adams2-1/+12
2008-11-22Remove old minimapsJared Adams27-0/+0
2008-11-22Add minimapsJared Adams32-0/+0
2008-11-22Warp fixesFate3-5/+5
2008-11-22Fixed desert hat and cotton headband colours to better match the other ↵Fate1-43/+43
colours; fixed standard headband colour
2008-11-22Brightened up headband and alpha-blended boundaries to eliminate artifactsFate2-0/+0
2008-11-22Fixed desert hat description and colour parametersFate2-12/+12
2008-11-21Fixed desert hat description and dyeingFate2-12/+12
2008-11-21Merge branch 'master' into map-renamingFate25-282/+1266
Conflicts: monsters.xml
2008-11-20Added new magic effect structureFate5-8/+117
2008-11-20made maggots slower and added an immobile, passive flower monster (id 12) ↵Philipp Sehmisch1-4/+26
for easier testing of hit detection.
2008-11-17Fixed colorisation of generic-itenPhilipp Sehmisch1-1/+1
2008-11-15Merge branch 'master' of git://gitorious.org/tmwdata/mainlineChuck Miller1-1/+3
2008-11-15Added runes.xml which will be used for the magic systemChuck Miller1-0/+110
2008-11-15Changed magic effects to new structure (different colours for different schools)Fate5-0/+120
2008-11-14Modified revision attribute to work with gitAndreas Habel1-1/+3
2008-11-13Converted DOS newlines to UNIXBjørn Lindeijer3-741/+741
2008-11-13Converted DOS newlines to UNIX for monsters.xmlBjørn Lindeijer1-459/+459
2008-11-13Commit QOAL's fixes for the standard headbandJared Adams3-2/+2