summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-06Merge branch 'master' into moornpcmoornpcJesusaves5-0/+8
2020-12-06Fix bugs on Micksha's behalfJesusaves1-4/+0
2020-12-06Merge branch 'master' into moornpcJesusaves150-133/+160
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-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-13mehMicksha1-0/+16
2020-11-13fix pipelineMicksha2-17/+1
2020-11-13fix something (not breaking, hopefully) in ranger hatMicksha1-8/+0
2020-11-13fix licenseMicksha1-1/+1
2020-11-13initial commit for the Asphodel Moor NPC placeholdersMicksha30-2/+428
2020-11-13Merge branch 'master' of https://gitlab.com/evol/clientdataMicksha3-14/+186
2020-11-07Contributor UpdateJesusaves1-13/+175
2020-11-07Merge branch 'ranger' into 'master'Jesusaves5-0/+27
2020-11-07Ranger HatMicksha5-0/+27
2020-11-06Add ranger hat as per toams requestMicksha5-0/+29
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
2020-08-25Merge branch 'fireball-sfx' into 'master'Jesusaves2-0/+3
2020-08-25FireballLedmitz2-0/+3
2020-08-25Merge branch 'bee-sfx' into 'master'Jesusaves6-0/+9
2020-08-25Bee SFX; die, hit, miss, moveLedmitz6-0/+9
2020-08-25Merge branch 'ghost-sfx' into 'master'Jesusaves6-0/+12
2020-08-25ghost: 1 die and 3 move soundsLedmitz6-0/+12
2020-08-24Merge branch 'spider-sfx' into 'master'Jesusaves11-5/+19
2020-08-241 die, 3 hits and 5 moves. Removed scorpion sounds and replaced with spider i...Ledmitz11-5/+19
2020-08-24Merge branch 'bows-wooden_short_forest' into 'master'Jesusaves8-2/+15
2020-08-24https://gitlab.com/Ledmitz/clientdata/-/project_membersLedmitz8-2/+15