summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-07-31Merge branch 'NetSysFire-master-patch-92944' into 'master'Jesusaves1-126/+127
Update items.xml See merge request TMW2/clientdata!129
2021-07-31Update items.xmlNetSysFire1-126/+127
2021-06-20Merge branch 'PiouIsles-fixes-patch' into 'master'r13.5_20210724seeds2-8/+8
Piou isles fixes patch See merge request TMW2/clientdata!128
2021-06-20Piou isles fixes patchseeds2-8/+8
2021-06-13Merge branch 'PiouIsles-quests-patch' into 'master'seeds1-0/+20
Piou isles quests patch See merge request TMW2/clientdata!127
2021-06-13Piou isles quests patchseeds1-0/+20
2021-06-07Translations UpdateJesusaves4-7072/+7596
2021-06-07Merge branch 'SpeedDuck-master-patch-58752' into 'master'Jesusaves1-1/+1
Nerf Rubber Ducky See merge request TMW2/clientdata!125
2021-06-07Nerf Rubber DuckySean Hulka1-1/+1
2021-06-06Merge branch 'PiouIsles' into 'master'seeds5-13/+56
Piou isles See merge request TMW2/clientdata!126
2021-06-06Piou islesseeds5-13/+56
2021-06-06Merge branch 'trithodex-master-patch-94245-silverdye' into 'master'Jesusaves1-4/+5
Replace 015-1.tmx - update scenery for lexi See merge request TMW2/clientdata!120
2021-06-06Replace 015-1.tmx - update scenery for lexiPovo1-4/+5
2021-05-29Merge branch 'SpeedDuck-master-patch-13846' into 'master'Sean Hulka1-0/+6
Add Stunning Strike skill and skill description. See merge request TMW2/clientdata!124
2021-05-29Add Stunning Strike skill and skill description.Sean Hulka1-0/+6
2021-05-25Add a placeholder for Mirror Lake ArmorJesusaves1-0/+11
2021-05-25Hide some layers. PS. 006-2-2 has script-controlled warpsJesusaves5-29/+29
2021-05-25Merge branch 'PiouIsles' into 'master'seeds8-763/+2246
Piou isles See merge request TMW2/clientdata!123
2021-05-25Piou islesseeds8-763/+2246
2021-05-23This was expected.Jesusaves2-8/+16
2021-05-23Assign IDs for Shrewboo and Piou KnightJesusaves3-0/+134
2021-05-23Fix typoJesusaves1-2/+2
2021-05-23Merge branch 'patch-15' into 'master'Jesusaves1-0/+0
Fixed slight pixel variation between Piou Knights See merge request TMW2/clientdata!90
2021-05-23Fixed slight pixel variation between Piou Knightsseeds1-0/+0
2021-05-23Merge branch 'patch-16' into 'master'Jesusaves3-0/+2
Patch 16 See merge request TMW2/clientdata!121
2021-05-23Patch 16 - Piou Knight & Shrewboo Monster SpritesJesusaves3-0/+2
By seeds and Box Of Shame
2021-05-23Remove some useless CI jobsJesusaves1-21/+0
2021-05-23Merge branch 'trithodex-master-patch-81211' into 'master'Jesusaves1-1/+1
Update quests.xml - Fix Tycoon level requirement for black scorpion hunt to... See merge request TMW2/clientdata!117
2021-05-23Merge branch 'trithodex-master-patch-tealdye' into 'master'Jesusaves1-0/+20
Update quests.xml See merge request TMW2/clientdata!113
2021-05-23Merge branch 'trithodex-master-patch-pinkdye' into 'master'Jesusaves1-0/+20
Update quests.xml Kevin's Quest See merge request TMW2/clientdata!108
2021-05-23Merge branch 'trithodex-master-patch-limedye' into 'master'Jesusaves1-0/+36
Update quests.xml - Raify's Quest See merge request TMW2/clientdata!114
2021-05-16Translation UpdatesJesusaves4-8169/+9118
2021-05-05Update quests.xml - Fix Tycoon level requirement for black scorpion hunt to ↵Povo1-1/+1
match Tycoon's actual requirements
2021-04-10[skip ci] This actually belongs to docs but can be here for a while...Jesusaves1-0/+32
The overlay code
2021-04-08Update Contributor list with GermanTMW staffJesusaves1-0/+13
2021-04-08Update Contributor ListJesusaves1-19/+155
2021-04-08Update license linksJesusaves1-1/+1
2021-04-08Dual license Irukard works with CC BY 4.0Irukard2-30/+120
```irukard — Today at 4:37 PM Is there any single license with attribution compatible with all parties? CC-BY 4.0? Jesusalva — Today at 4:38 PM Hmm yes, CC BY is widely used exactly because it allows to be used anywhere as long that attribution is given Without any other real restriction irukard — Today at 4:38 PM So that will be the one I pick Jesusalva — Today at 4:39 PM For future works or does this applies to already released ones? irukard — Today at 4:39 PM Is there any problem with that? Jesusalva — Today at 4:39 PM Nope, none at all. irukard — Today at 4:39 PM I can not revoke GPL2 works Jesusalva — Today at 4:39 PM Nope, you can dual license though irukard — Today at 4:39 PM I can add CC-BY to them Jesusalva — Today at 4:40 PM (Which is also partly how we got to the point where most stuff is dual licensed with GPL) irukard — Today at 4:40 PM That is what I am planning to do```
2021-04-01Update READMEJesusaves1-1/+23
2021-04-01CI: Map Version validation, required for the new clientJesusaves0-0/+0
2021-04-01Update all maps to Tiled 1.4.1+Jesusaves81-1157/+1189
Lock some of the height layer to prevent accidental editing
2021-04-01Update several maps to comply with our "TSX only for animated tiles" policyJesusaves27-387/+613
2021-04-01Remove evil fileJesusaves1-4/+0
2021-03-24Update quests.xml - Raify's QuestPovo1-0/+36
2021-03-23Update quests.xmlPovo1-0/+20
2021-03-23Update Ash Urn and Earth Scrollr13.3+1_20210401Jesusaves1-2/+4
2021-03-23Plague 029-5Jesusaves1-1/+11
2021-03-22Merge branch 'Map-Fix-Xanthem' into 'master'Christopher Chay3-47/+47
Map fix xanthem See merge request TMW2/clientdata!109
2021-03-22Map fix xanthemChristopher Chay3-47/+47
2021-03-22Update quests.xml Kevin's QuestPovo1-0/+20