summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-11-12Merge branch 'master' into livio/20201108_west_argaeslivio/20201108_west_argaesJesusaves1-5/+25
2020-11-12Just some minor things which were annoying me, nothing of importanceJesusaves3-141/+141
2020-11-12Tab fixesLivio Recchia1-136/+136
2020-11-12Tab fixesLivio Recchia2-60/+1
2020-11-12Merge branch 'livio/20201108_west_argaes' of gitlab.com:liviorecchia/serverda...Livio Recchia2-0/+59
2020-11-12Tab cleanup, minor code style fixesLivio Recchia3-460/+460
2020-11-12Apply 1 suggestion(s) to 1 file(s)Livio Recchia1-1/+1
2020-11-12Apply 1 suggestion(s) to 1 file(s)Livio Recchia1-1/+1
2020-11-11Fixed required ingredientsLivio Recchia4-14/+11
2020-11-10Forgot to add files.Livio Recchia2-0/+134
2020-11-10Forgot to add rewards from Ryan's questLivio Recchia1-0/+2
2020-11-10Completed Cpt. Hal / Sgt. Ryan quest. Improved libquest. Overall code cleaning.Livio Recchia7-549/+246
2020-11-09Added debug functions (Hal debug still defective)Livio Recchia1-3/+4
2020-11-09Introduced Sergeant Ryan subquestLivio Recchia4-20/+320
2020-11-08Implementing first steps of incomplete Hal questLivio Recchia4-9/+136
2020-11-08Merge branch 'mifritscher/donald-selling-arrows' into 'master'Jesusaves1-5/+25
2020-11-08Donald: Can sell arrows nowMichael Fritscher1-5/+25
2020-11-07Merge branch 'ranger' into 'master'Jesusaves1-0/+19
2020-11-06add ranger hat to item_dbMicksha1-0/+19
2020-10-24Fetch translations and regenerate lang files for contentIIIJesusaves8-4974/+20190
2020-10-24Merge branch 'jesusalva/contentIII' into 'master'Jesusaves192-469/+5366
2020-10-24CONTENT III SUPER MERGE REQUESTJesusaves192-469/+5366
2020-10-23main.sql should reflect OUR needs, not RO's needs.Jesusaves1-2/+2
2020-10-20Merge branch 'jesusalva/henry2' into 'master'Jesusaves4-12/+27
2020-10-20Change some dialog to suit better to WildXJesusaves4-12/+27
2020-10-16Merge branch 'jesusalva/jukebox' into 'master'Jesusaves6-2/+104
2020-10-16JukeboxJesusaves6-2/+104
2020-10-15Merge branch 'livio/galimatia' into 'master'Jesusaves6-24/+503
2020-10-15Galimatia Quest - Incomplete Draft.Livio Recchia6-24/+503
2020-10-11Merge branch 'jesusalva/AFK' into 'master'Micksha13-47/+175
2020-10-11AFKing SystemJesusaves13-47/+175
2020-09-28Merge branch 'NPCs' into 'master'Jesusaves46-0/+933
2020-09-28Initial commit for Tulimshar NPCs, and Lore NPCs in West Woodland as per Wild...Micksha46-0/+933
2020-09-26Fix the bug @Micksha left on stews - No more stone effect!s20200927Jesusaves1-4/+4
2020-09-22Merge branch 'contentII' into 'master'Micksha8-124/+3839
2020-09-22Content iiMicksha8-124/+3839
2020-09-18Merge branch 'jesusalva/refinery' into 'master'Micksha5-23/+132
2020-09-18Refine prototypeJesusaves5-23/+132
2020-09-18Merge branch 'jesusalva/cut001' into 'master'Jesusaves8-4/+298
2020-09-18Cutscene for Morcant.Jesusaves8-4/+298
2020-09-17Merge branch 'jesusalva/cut003' into 'master'Jesusaves1-0/+65
2020-09-17Nard will allow some players to skip Drasil Island (Evol Beta) and go straigh...Jesusaves1-0/+65
2020-09-17Merge branch 'jesusalva/magic' into 'master'Jesusaves7-133/+523
2020-09-17Magic v1 Core DeclarationJesusaves7-133/+523
2020-09-17Merge branch 'jesusalva/cut002' into 'master'Jesusaves7-19/+147
2020-09-17Use smuggler tunnels for rowboatJesusaves7-19/+147
2020-09-08Merge branch 'showimage' into 'master'Jesusaves1-0/+21
2020-08-29add a command to display images in NPC windowsgumi1-0/+21
2020-08-29Merge branch 'jesusalva/magic' into 'master'Jesusaves5-0/+314
2020-08-29Magic Core SystemJesusaves5-0/+314