summaryrefslogtreecommitdiff
AgeCommit message (Collapse)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 ↵Livio Recchia2-0/+59
gitlab.com:liviorecchia/serverdata into livio/20201108_west_argaes Tab fixes
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
Donald: Can sell arrows now See merge request evol/serverdata!275
2020-11-08Donald: Can sell arrows nowMichael Fritscher1-5/+25
2020-11-07Merge branch 'ranger' into 'master'Jesusaves1-0/+19
Ranger Hat See merge request evol/serverdata!277
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
Content III Closes evol-all#107, evol-all#16, evol-all#62, evol-all#12, evol-all#109, and evol-all#98 See merge request evol/serverdata!272
2020-10-24CONTENT III SUPER MERGE REQUESTJesusaves192-469/+5366
Included: * Tulimshar Casino * Placeholder fixing/filling * Food Questline * Rossy Quest * Galimatia Quest (mostly by Livio) * Edourard bugs * Blood Donor Quest (from Moubootaur Legends) * Merchant Guild Quest * Mundane Bugfix * La Marine * Hurns Doctor easter eggs * Sailing to Argaes with Legion * Other things not relevant enough to be noted down, I guess
2020-10-23main.sql should reflect OUR needs, not RO's needs.Jesusaves1-2/+2
And in this case, quest.count2 and quest.count3 must be a signed integer. aka. INT(11) or INT SIGNED.
2020-10-20Merge branch 'jesusalva/henry2' into 'master'Jesusaves4-12/+27
Change some dialog to suit better to WildX See merge request evol/serverdata!266
2020-10-20Change some dialog to suit better to WildXJesusaves4-12/+27
2020-10-16Merge branch 'jesusalva/jukebox' into 'master'Jesusaves6-2/+104
Jukebox See merge request evol/serverdata!268
2020-10-16JukeboxJesusaves6-2/+104
This allows players to use @jukebox like @music anywhere And it also adds a classy Jukebox in Hurnscald PUB. First experiment with public functions, don't blame me if it breaks :p Low priority, adding to MR list in order to met deadlines.
2020-10-15Merge branch 'livio/galimatia' into 'master'Jesusaves6-24/+503
Galimatia Quest See merge request evol/serverdata!271
2020-10-15Galimatia Quest - Incomplete Draft.Livio Recchia6-24/+503
Merged to prevent conflicts with contentIII which has priority.
2020-10-11Merge branch 'jesusalva/AFK' into 'master'Micksha13-47/+175
AFKing System Closes evol-all#108 See merge request evol/serverdata!267
2020-10-11AFKing SystemJesusaves13-47/+175
Implemented at the Rusty Pick Inn (Hurnscald) only. Red Plush Inn will be next. Right now, beer/red plush wine/etc. do not affect EXP gain, only players nearby do. MAX_IDLE is using the same variable form as Moubootaur Legends. It can be set to a constant if needed. Wandering storytellers not yet implemented, I believe @toams will use Kfahr and Janus to do that later™ ---- close evol-all#108
2020-09-28Merge branch 'NPCs' into 'master'Jesusaves46-0/+933
Initial commit for Tulimshar NPCs, and Lore NPCs in West Woodland as per WildX request See merge request evol/serverdata!265
2020-09-28Initial commit for Tulimshar NPCs, and Lore NPCs in West Woodland as per ↵Micksha46-0/+933
WildX request
2020-09-26Fix the bug @Micksha left on stews - No more stone effect!s20200927Jesusaves1-4/+4
Unassigned variable (SC_INC_HIT) defaults to 0. 0 is SC_STONE. Fixed the variable to "SC_INCHIT" as originally intented.
2020-09-22Merge branch 'contentII' into 'master'Micksha8-124/+3839
Content ii See merge request evol/serverdata!260
2020-09-22Content iiMicksha8-124/+3839
2020-09-18Merge branch 'jesusalva/refinery' into 'master'Micksha5-23/+132
Refine prototype See merge request evol/serverdata!214
2020-09-18Refine prototypeJesusaves5-23/+132
+2 atk/matk per refine level +1 weapon exp per killed monster level Roughly based on Monster Point System + ML Refine System.
2020-09-18Merge branch 'jesusalva/cut001' into 'master'Jesusaves8-4/+298
rEvolt cutscenes: Morcant Closes evol-all#74 See merge request evol/serverdata!257
2020-09-18Cutscene for Morcant.Jesusaves8-4/+298
2020-09-17Merge branch 'jesusalva/cut003' into 'master'Jesusaves1-0/+65
Allow skipping Drasil Island See merge request evol/serverdata!264
2020-09-17Nard will allow some players to skip Drasil Island (Evol Beta) and go ↵Jesusaves1-0/+65
straight to the first Narrator cutscene. This will auto-complete every Ship and Drasil Quest and therefore is not advised. It should cut 30\~60 minutes of gameplay which was unchanged since... 2013? ONLY FOR LEGACY PLAYERS.
2020-09-17Merge branch 'jesusalva/magic' into 'master'Jesusaves7-133/+523
Magic v1 (Core Declarations) See merge request evol/serverdata!262
2020-09-17Magic v1 Core DeclarationJesusaves7-133/+523
Technical feature only. Subject to changes post-commit.
2020-09-17Merge branch 'jesusalva/cut002' into 'master'Jesusaves7-19/+147
Rowboat Rework See merge request evol/serverdata!261
2020-09-17Use smuggler tunnels for rowboatJesusaves7-19/+147
2020-09-08Merge branch 'showimage' into 'master'Jesusaves1-0/+21
add a command to display images in NPC windows See merge request evol/serverdata!259
2020-08-29add a command to display images in NPC windowsgumi1-0/+21
2020-08-29Merge branch 'jesusalva/magic' into 'master'Jesusaves5-0/+314
Moubootaur Legends Magic Core See merge request evol/serverdata!249
2020-08-29Magic Core SystemJesusaves5-0/+314
Contains only utilities and placeholders. Original code from Moubootaur Legends Ported here to serve as base.