summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-06Merge branch 'master' of gitlab.com:evol/clientdata into jesusalva/contentIVjesusalva/contentIVJesusaves11-0/+23
2020-12-06Merge branch 'Halberd_sfx' into 'master'Jesusaves11-0/+23
2020-12-06Merge branch 'master' into jesusalva/contentIVJesusaves36-32/+436
2020-12-06Added Halberd hits. Misses required adding Staff sounds as well.Ledmitz11-0/+23
2020-12-06Merge branch 'moornpc' into 'master'Jesusaves30-2/+428
2020-12-06Asphodel Moor NPC PlaceholdersMicksha30-2/+428
2020-12-06Merge branch 'Setzer_sfx' into 'master'Jesusaves5-0/+8
2020-12-06Corrected file locations to conform with rEvolt standards.Ledmitz5-6/+7
2020-12-06Added sfx for Setzer hitsLedmitz5-0/+7
2020-11-29Merge branch 'jesusalva/sillytest' into 'master'Jesusaves2-30/+0
2020-11-29Remove the Contributors CI testJesusaves2-30/+0
2020-11-14Add mailmapJesusaves1-0/+32
2020-11-13Merge branch 'master' into jesusalva/contentIVJesusaves148-103/+160
2020-11-13Save garbage on upstreamJesusaves3-6/+6
2020-11-14Merge branch 'init_map_music_clientdata' into 'master'Jesusaves148-103/+160
2020-11-14Changed music track names in maps to correspond to recently changed music names.Ledmitz148-103/+160
2020-11-13Some makeup to some mapsJesusaves4-19/+19
2020-11-12Oooh, I forgot licenseJesusaves1-0/+2
2020-11-12Knight's Helmet (posterized for 16 colors, no palette or whatsoever)Jesusaves4-3/+25
2020-11-11Update Tiki by HocusJesusaves1-0/+0
2020-11-10Quest control gap (TileCondition 4 - Air Collision/ID2)Jesusaves1-1/+148
2020-11-10Covert Tulimshar Large Slum Hut into a Clinic,Jesusaves2-9/+9
2020-11-09oops - saved collisions visible by accidentJesusaves1-1/+1
2020-11-09Transfer Tulimshar Golden Scorpion authorityJesusaves1-9/+1
2020-11-09Blub ConversionJesusaves1-17/+9
2020-11-09Resave maps, nothing to see here :bJesusaves4-8/+8
2020-11-09Upgrade map versioningJesusaves6-29/+29
2020-11-07Contributor UpdateJesusaves1-13/+175
2020-11-07Merge branch 'ranger' into 'master'Jesusaves5-0/+27
2020-11-07Ranger HatMicksha5-0/+27
2020-10-24Merge branch 'jesusalva/contentIII' into 'master'Jesusaves108-665/+3795
2020-10-24CONTENT III - Super Merge RequestJesusaves108-665/+3795
2020-10-16Merge branch 'jesusalva/cut002' into 'master'Jesusaves3-6/+83
2020-10-16Required small changes for cutscene 002Jesusaves3-6/+83
2020-10-16Merge branch 'hocus/jukebox' into 'master'Jesusaves4-1/+23
2020-10-16Add a lurwitzer jukeboxKurt Kuschinski4-1/+23
2020-10-11Merge branch 'AFKing' into 'master'Micksha7-2/+55
2020-10-11AFKingMicksha7-2/+55
2020-09-28Merge branch 'NPCs' into 'master'Jesusaves10-4/+152
2020-09-28add Tulimshar's NPC placeholders; add Hal and his Soldiers.Micksha10-4/+152
2020-09-23Merge branch 'kyttymaps' into 'master's20200927Micksha14-591/+1252
2020-09-23KyttymapsMicksha14-591/+1252
2020-09-22Merge branch 'contentII' into 'master'Micksha352-339/+6596
2020-09-22initial commit for adding all missing equipment, accessoires, items, and Mist...Micksha352-339/+6596
2020-08-31Add the missing "or later" clause at LICENSE file to GPL v2.Jesusaves1-1/+1
2020-08-31Semi-Automatically replace every CC-BY-SA license with author unknownJesusaves1-142/+142
2020-08-31Just a typo, nothing to see here, move on...Jesusaves1-1/+1
2020-08-31Synchronize license for most of non-item files with the one at Moubootaur Leg...Jesusaves2-73/+81
2020-08-25Merge branch 'magic-heal' into 'master'Jesusaves3-1/+3
2020-08-25magic-healLedmitz3-1/+3