summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-08-06Merge branch 'typos' into 'master' Reid4-6/+6
Fixed a few typos reported by Ledmitz and removed the shovel "can't dig here" message from a npc window, it's now a message over the player's head. See merge request !32
2016-08-06Removed capital letter from "Omatt" (to "omatt").Alige1-1/+1
2016-08-06Fixed a few typos reported by Ledmitz (thanks brother).Alige2-4/+4
2016-08-06Shouldn't open a npc chat window just to say the player can't dig somewhere.Alige1-1/+1
2016-08-06Merge branch 'Fishing' into 'master' Reid2-17/+21
change fishing pull_max, add timer; change label name in wateranimation In function/fishing : * pull_max come back to 800 * add addtimer OnRemoveBait * add 2 deltimer OnRemoveBait In 001-1/wateranimation : * turn all OnTimer35000 to OnRemoveBait See merge request !31
2016-08-06change fishing pull_max, add timer; change label name in wateranimationomatt2-17/+21
2016-08-06Update the fishing support with the new animation.Reid2-213/+273
2016-08-05Add 001-2-41 (Edouard's house) and improve the barber system.Reid10-4/+106
2016-08-04Add a blank line on the BarberSayStyle inside the speech flag.Reid1-1/+1
2016-08-04Merge branch 'fishing_feature' into 'master' Reid2-116/+287
change water animation (001-1), and change fishing function The wateranimation.txt of 001-1 are changed, and the /function/fishing.txt are changed too: * First, the principal use was for fix the 100% success of fishing. Now if player pull before the fish bite de bait, he lost the bait. * Second, this require sprite (or something other) for fishing animation ("OnPull" of water animation 001-1, now the animation are an emote for testing). * Third, that need to change the dialogue for explain to player to wait the signal (fishing animation) for pull. * And, of course, for prevent if that can be exploit, that need to be tested. See merge request !28
2016-08-04change water animation (001-1), and change fishing functionomatt2-116/+287
2016-08-04Merge branch 'change_barber' into 'master' Reid4-77/+103
add BarberSayStyle function in barber.txt, and add new line on the top of menu of edouard Add BarberSayStyle in barber.txt Add line in the top of menu of Edouard. Player can ask now, what is the name of hairstyle. See merge request !26
2016-08-04add BarberSayStyle function in barber.txt, and add new line on the top of ↵omatt4-77/+103
menu of edouard, add hairstyle and haircolor array in npc/config/hairstyle_config.txt.
2016-08-03Restores missing skill skills for elementals and guilds.Andrei Karas3-0/+117
2016-08-02Update map cache.Alige1-0/+0
2016-07-31Add another bow and add limits to bows for ammo.Andrei Karas1-2/+24
2016-07-31Add two arrows into item_db.confAndrei Karas1-0/+22
2016-07-31Update a bit monsters speed.Andrei Karas1-7/+7
Monsters should move faster than default player or with comparable speed.
2016-07-31Add one testing bow and arrow.Andrei Karas1-0/+25
2016-07-27Remove unused homunculuses.Andrei Karas1-12/+0
2016-07-27Add testing mercenary and add it mercenary creation to testing npc.Andrei Karas2-1/+22
2016-07-27Add testing homunculus with name Homun.Andrei Karas1-1/+1
2016-07-25NPC Robin mentions Kaizei (TMW/Evol).Akko Teru1-1/+11
2016-07-24A warrior is not always too tense to say some advice.Akko Teru1-3/+9
2016-07-24Legion blather. Exclude the misplaced dialogue-box.Akko Teru1-7/+8
2016-07-20Removed male/female uncessary translation in arpan's script.Alige1-1/+1
2016-07-20In elmo's script, a sentence shouldn't be different for male/female.Alige1-1/+1
2016-07-19Update skill_db.conf header.Andrei Karas1-0/+2
2016-07-19Update translations.Andrei Karas22-5294/+7241
2016-07-19Merge branch 'Change_arpan_money_dialogue' into 'master' Alige2-3/+18
change the arpan dialogue about money in old cloths sentence Change Arpan money state of quest : 0 = no message about money in Arpan text, one message in Elmo text. (Elmo set quest to 1 when player respond to Elmo he don't has receive money from Arpan) 1 = message about money, one message in Elmo text. (Arpan set quest to 2 when player ask for money and receive the money) 2 = no message, end. one message money done in Elmo text. Sentence about old cloth fit better with the original Elmo question. See merge request !25
2016-07-19change the arpan dialogue about money in old habitomattornot2-3/+18
2016-07-19Merge branch 'typos' into 'master' Alige26-64/+67
Continued fixing typos and rewording sentences, after reading the translations. See merge request !27
2016-07-19Continued fixing typos and rewording sentences, after reading the translations.Alige26-64/+67
2016-07-18Update skill EVOL_MASS_PROVOKE.Andrei Karas1-6/+23
Set casting time to 10 seconds for testing.
2016-07-18Update map cache and reverted the (bad) change I did in init.sh file because ↵Alige2-1/+1
didn't rebase.
2016-07-17Remove client versions list.Andrei Karas1-17/+0
2016-07-17Fixed issues in groups.conf file.Alige1-10/+1
2016-07-17Merge branch 'master' of gitlab.com:evol/serverdataAlige1-1/+1
2016-07-17Because of translations, reworked several sentences in scripts, added ↵Alige37-72/+74
missing words and M/F options.
2016-07-17Fix typo in debug message in ci scriptAndrei Karas1-1/+1
2016-07-17Add @email command for all users.s20160717Andrei Karas1-0/+1
2016-07-15Merge branch 'patches' into 'master' Andrei Karas1-38/+128
Extended groups.conf file in order to organise the hierarchy of GMs. See merge request !23
2016-07-15Extended groups.conf file in order to organise the hierarchy of GMs.Alige1-38/+128
2016-07-14The 4 directions (N, S, E, W) should not take a capital letter unless in the ↵Alige3-5/+5
name of a place. Also reworded a sentence in Enora's script, linked to these changes.
2016-07-14Reworded a sentence in chelios' script.Alige1-1/+2
2016-07-14Merge branch 'change_nard_dialog' into 'master' Alige2-3/+20
add line in menu of both Nard.txt change oder of sentence in menu, and add an information line of nard#artis add an information line of nard#ship See merge request !20
2016-07-14add lines in menu of both Nard.txtomattornot2-3/+20
2016-07-14Merge branch 'typos' into 'master' Andrei Karas5-15/+13
Fixes typos and rewords several sentences. See merge request !21
2016-07-13Reworded a sentence in enora's script, it also had a missing full stop at ↵Alige1-1/+1
its end.
2016-07-13Missing full stop in edouard's script and added goodbye function at the end.Alige1-4/+2