summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-03-05Merge branch 'Mick-Mona' into 'master'Micksha4-50/+179
2019-03-05Replace gettimetick(2) with has_instance2(), because quest.count2 is not big ...Micksha4-50/+179
2019-03-05Merge branch 'jesusalva/sandwhich' into 'master'Micksha13-8/+609
2019-03-05Update the quest to address Micksha notes.Jesusaves13-8/+609
2019-03-04Merge branch 'jesusalva/miscimprovements' into 'master'Micksha2-0/+2
2019-03-04These minor improvements are important for the game.Jesusaves2-0/+2
2019-03-03Merge branch 'Yannika' into 'master'Micksha2-0/+21
2019-03-03adding Yannika NPCMicksha2-0/+21
2019-03-03Merge branch 'sandwiches' into 'master'Micksha1-0/+81
2019-03-03add the three first sandwichesMicksha1-0/+81
2019-03-01Remove extra white spacesAndrei Karas18-60/+60
2019-03-01Add ci checks for bad new lines or trailing white spacesAndrei 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
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
2019-02-28The four sewer mouths in Artis. They all behave differently.Jesusaves3-7/+125
2019-02-28Merge branch 'darktileset' into 'master'Micksha12-1/+110
2019-02-28add mana ghost mob and Valia NPCMicksha12-1/+110
2019-02-28Merge branch 'jesusalva/GuidedTour' into 'master'Micksha3-1/+17
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
2019-02-13Toams/rowboat + Micksha/galmatiaMicksha24-15/+713
2019-02-12Merge branch 'weapons' into 'master'Micksha2-18/+64
2019-02-12Add the chopstick and the axe that were accidentially merged in client-data a...Micksha2-18/+64
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
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
2018-11-22Merge branch 'mobs' into 'master's20181205Micksha15-10/+344
2018-11-22Add all the gem veins, add beehiveMicksha15-10/+344
2018-11-19Merge branch 'veins' into 'master'Micksha1-0/+8
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
2018-11-15more improvements for the rusty pick's npc'stoams7-46/+109
2018-11-09Merge branch 'maps' into 'master'Micksha6-3/+8
2018-11-07Add the rossy caveMicksha6-3/+8
2018-11-06Merge branch 'Gumicommit' into 'master'Micksha86-53/+4753
2018-11-05fix item_dbMicksha1-264/+1
2018-11-05Merge branch 'Gumicommit' of https://gitlab.com/Micksha/serverdata into Gumic...Micksha1-9/+273
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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-18 17:43:44 +0000