summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-12-29Merge branch 'mapfix' into 'master'HEADmasterJesusaves10-86/+86
Fix map bugs See merge request evol/clientdata!204
2020-12-29fix map bugs reported by jak1 - Thank you a lot for this proper list, so ↵Micksha10-86/+86
easy to fix in half an hour!
2020-12-29Merge branch 'stable' into 'master'Jesusaves3-3/+3
deploying stable only, switched spm to scheduled repository See merge request evol/clientdata!205
2020-12-28deploying stable only, switched spm to scheduled repositorystablejak13-3/+3
2020-12-06Regenerate auto-generated content (such as minimaps and contrib list)Jesusaves4-5/+4
2020-12-06Merge branch 'Mob_Bow_sfx' into 'master'Jesusaves1-6/+6
Edited monsters.xml to include bow sounds for archer types of mobs. See merge request evol/clientdata!194
2020-12-06Edited monsters.xml to include bow sounds for archer types of mobs.Ledmitz1-6/+6
2020-12-06Merge branch 'Ledmitz/clientdata-fireball-sfx' into 'master'Jesusaves3-3/+5
Ledmitz/clientdata fireball sfx See merge request evol/clientdata!195
2020-12-06Moved fireball.ogg back to env DIR as it is used for different effects and ↵Ledmitz3-3/+5
added as a sound for fire-explosion in effects.xml
2020-12-06Corrected typo Cador to Candor in name property.Ledmitz1-1/+1
2020-12-06Merge branch 'Snake_sfx' into 'master'Jesusaves3-0/+6
Added snake hit sfx from TMW. Was cavesnake. See merge request evol/clientdata!193
2020-12-06Added snake hit sfx from TMW. Was cavesnake.Ledmitz3-0/+6
2020-12-06Merge branch 'Maggot_sfx' into 'master'Jesusaves6-0/+17
Added Maggot sfx from TMW See merge request evol/clientdata!190
2020-12-06Added Maggot sfx from TMWLedmitz6-0/+17
2020-12-06Merge branch 'Bat_sfx' into 'master'Jesusaves4-6/+9
Added sfx for Bats/Crafties See merge request evol/clientdata!189
2020-12-06Added sfx for Bats/CraftiesLedmitz4-6/+9
2020-12-06Merge branch 'RockKnife_sfx' into 'master'Jesusaves4-0/+5
Added sfx for RockKnife hits. See merge request evol/clientdata!188
2020-12-06Added sfx for RockKnife hits.Ledmitz4-0/+5
2020-12-06Merge branch 'Bow-Banshee' into 'master'Jesusaves8-0/+13
Added sfx for BansheeBow See merge request evol/clientdata!187
2020-12-06Added sfx for BansheeBowLedmitz8-0/+13
2020-12-06Merge branch 'jesusalva/contentIV' into 'master'Jesusaves27-100/+287
Content IV See merge request evol/clientdata!186
2020-12-06Client-side for content IVJesusaves27-100/+287
2020-12-06Merge branch 'Halberd_sfx' into 'master'Jesusaves11-0/+23
Added Halberd hits. Misses required adding Staff sounds as well. See merge request evol/clientdata!185
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
Asphodel Moor NPC Placeholders See merge request evol/clientdata!196
2020-12-06Asphodel Moor NPC PlaceholdersMicksha30-2/+428
2020-12-06Merge branch 'Setzer_sfx' into 'master'Jesusaves5-0/+8
Added sfx for Setzer hits See merge request evol/clientdata!184
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
Remove the Contributors CI test See merge request evol/clientdata!181
2020-11-29Remove the Contributors CI testJesusaves2-30/+0
2020-11-14Merge branch 'init_map_music_clientdata' into 'master'Jesusaves148-103/+160
Music added to maps Closes evol-all#111 See merge request evol/clientdata!182
2020-11-14Changed music track names in maps to correspond to recently changed music names.Ledmitz148-103/+160
Other minor corrections. Feel free to reassign music in maps in a separate MR.
2020-11-07Contributor UpdateJesusaves1-13/+175
2020-11-07Merge branch 'ranger' into 'master'Jesusaves5-0/+27
Ranger Hat See merge request evol/clientdata!179
2020-11-07Ranger HatMicksha5-0/+27
2020-10-24Merge branch 'jesusalva/contentIII' into 'master'Jesusaves108-665/+3795
Content III See merge request evol/clientdata!178
2020-10-24CONTENT III - Super Merge RequestJesusaves108-665/+3795
Part 1/2 on content for Novemember 11th deadline
2020-10-16Merge branch 'jesusalva/cut002' into 'master'Jesusaves3-6/+83
Required small changes for cutscene 002 See merge request evol/clientdata!171
2020-10-16Required small changes for cutscene 002Jesusaves3-6/+83
(Have bugs)
2020-10-16Merge branch 'hocus/jukebox' into 'master'Jesusaves4-1/+23
Add a lurwitzer jukebox See merge request evol/clientdata!174
2020-10-16Add a lurwitzer jukeboxKurt Kuschinski4-1/+23
2020-10-11Merge branch 'AFKing' into 'master'Micksha7-2/+55
AFKing See merge request evol/clientdata!177
2020-10-11AFKingMicksha7-2/+55
2020-09-28Merge branch 'NPCs' into 'master'Jesusaves10-4/+152
NPCs See merge request evol/clientdata!173
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
Kyttymaps See merge request evol/clientdata!172
2020-09-23KyttymapsMicksha14-591/+1252
2020-09-22Merge branch 'contentII' into 'master'Micksha352-339/+6596
Adding all missing equipment, accessoires, items, and some additional stuff See merge request evol/clientdata!170
2020-09-22initial commit for adding all missing equipment, accessoires, items, and ↵Micksha352-339/+6596
Mister Prickel whilst updating and preparing stuff for crafting
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-05-10 15:28:33 +0000