summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-03-01Add ci checks for bad new lines or trailing white spacescitestAndrei Karas3-0/+43
2019-03-01Fix move command error and style in rowboat npcAndrei Karas1-7/+6
2019-02-28Merge branch 'jesusalva/hugolinus' into 'master'Micksha1-0/+2
Allow @ hugo and @ linus to all GMs with access to @ goto See merge request evol/serverdata!132
2019-02-28Allow @ hugo and @ linus to all GMs with access to @ gotoJesusaves1-0/+2
2019-02-28Merge branch 'jesusalva/manhole' into 'master'Micksha3-7/+125
Micksha Man Hole Experiment See merge request evol/serverdata!150
2019-02-28The four sewer mouths in Artis. They all behave differently.Jesusaves3-7/+125
The first one is still TODO to prevent conflicts with Mundane Quest
2019-02-28Merge branch 'darktileset' into 'master'Micksha12-1/+110
add mana ghost mob and Valia NPC See merge request evol/serverdata!149
2019-02-28add mana ghost mob and Valia NPCMicksha12-1/+110
2019-02-28Merge branch 'jesusalva/GuidedTour' into 'master'Micksha3-1/+17
Guide players by hand to get started on the game. See merge request evol/serverdata!133
2019-02-28Guide players by hand to get started on the game.Jesusaves3-1/+17
2019-02-13Merge branch 'toams/rowboat' into 'master'Micksha24-15/+713
Toams/rowboat + Micksha/galmatia See merge request evol/serverdata!146
2019-02-13Toams/rowboat + Micksha/galmatiaMicksha24-15/+713
2019-02-12Merge branch 'weapons' into 'master'Micksha2-18/+64
Add the chopstick and the axe that were accidentially merged in client-data already See merge request evol/serverdata!147
2019-02-12Add the chopstick and the axe that were accidentially merged in client-data ↵Micksha2-18/+64
already
2019-02-11Fix ci compilation with gcc-6Andrei Karas1-5/+5
2019-02-11Switch to debian stretch in gcc-6 buildsAndrei Karas1-2/+2
2019-01-26Update translationss20190211Andrei Karas17-111/+22524
2019-01-26Fix translations issues in 008-2-2/note.txtAndrei Karas1-3/+3
2019-01-23Update from herculesAndrei Karas8-7/+74
2019-01-23Disable gcc-5 ci jobsAndrei Karas1-1/+1
2019-01-19Merge branch 'knife' into 'master's20190123Micksha5-13/+109
Knife - change equip level from 15 --> 1 See merge request evol/serverdata!144
2019-01-19Knife - change equip level from 15 --> 1Micksha5-13/+109
2018-12-06Remove extra parameter from function getnpcidAndrei Karas8-16/+16
2018-12-05Changes after hercules updateAndrei Karas4-2/+28
Updated some configurations and messages file.
2018-11-22Merge branch 'mobs' into 'master's20181205Micksha15-10/+344
Add all the gem veins, add beehive See merge request evol/serverdata!141
2018-11-22Add all the gem veins, add beehiveMicksha15-10/+344
2018-11-19Merge branch 'veins' into 'master'Micksha1-0/+8
make the veins attackable, change client-data in the mapfixes MR See merge request evol/serverdata!139
2018-11-19make the veins attackable, change client-data in the mapfixes MRMicksha1-0/+8
2018-11-16Merge branch 'master' into 'master'Micksha7-46/+109
more improvements for the rusty pick's npc's See merge request evol/serverdata!138
2018-11-15more improvements for the rusty pick's npc'stoams7-46/+109
2018-11-09Merge branch 'maps' into 'master'Micksha6-3/+8
Map merge request See merge request evol/serverdata!137
2018-11-07Add the rossy caveMicksha6-3/+8
2018-11-06Merge branch 'Gumicommit' into 'master'Micksha86-53/+4753
Gumicommit See merge request evol/serverdata!136
2018-11-05fix item_dbMicksha1-264/+1
2018-11-05Merge branch 'Gumicommit' of https://gitlab.com/Micksha/serverdata into ↵Micksha1-9/+273
Gumicommit
2018-11-05fix a few mapsMicksha4-2/+2
2018-11-05forgot to include this file in previous committoams1-1/+2
2018-11-05Rename bartender to barron and add a shoptoams3-20/+57
2018-11-05make melinda walk againtoams1-1/+1
2018-11-05add the torch.Micksha1-3/+30
2018-11-05fix script bugsMicksha1-1/+1
2018-11-05Add 3 varieties of Healing and Mana Potions, add iron and concentration ↵Micksha1-0/+252
potion. Only healing potions working for now.
2018-11-05Add the rowboat and Koga NPCs to ArtisMicksha6-2/+45
2018-11-05Requested Re-namingMicksha2-2/+2
2018-11-05Fix a few scripts, improve two mapsMicksha6-15/+150
2018-11-05Add Gumis scripts - delete placeholders. Disable debugs.Micksha45-1474/+943
2018-11-05fix Receptionist script *meh*Micksha1-1/+1
2018-11-05bugfix a few NPCsMicksha3-5/+5
2018-11-05Add Mundane and SophiallaMicksha3-0/+42
2018-11-05Add all the Hurns NPCsMicksha52-35/+553