Lemongrass3110 644e294699 Merge branch 'master' into woe_te-restrictions ...

# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h

2016-09-29 08:13:31 +02:00

..

eden

Corrected OnTouch/OnTouch_ in NPC script (#1548)

2016-09-07 21:35:14 +02:00

first_class

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

newgears

Fixed dialog

2016-02-23 21:58:30 +01:00

skills

Script bug fixes.

2014-08-16 19:10:19 -04:00

woe_te

Mapflag:

2016-09-02 01:36:16 +02:00

cupet.txt

- Added mercenary guild switch npc from aegis

2014-06-30 17:07:05 +02:00

homun_s.txt

Another clean-up

2015-12-09 23:09:17 +01:00

magic_books.txt

Another clean-up

2015-12-09 23:09:17 +01:00

monstertamers.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

mrsmile.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

ninja_quests.txt

- Added mercenary guild switch npc from aegis

2014-06-30 17:07:05 +02:00

pile_bunker.txt

Added official names as comments in many newer scripts.

2014-01-22 15:59:21 -05:00

quests_13_1.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

quests_aldebaran.txt

Adjusted Nightmare Clock Tower warper to use scope variable instead of temporary char variable

2016-09-09 08:46:31 +07:00

quests_brasilis.txt

Removed useless lines

2016-06-22 15:50:40 +02:00

quests_dewata.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

quests_dicastes.txt

Corrected OnTouch/OnTouch_ in NPC script (#1548)

2016-09-07 21:35:14 +02:00

quests_eclage.txt

Corrected OnTouch/OnTouch_ in NPC script (#1548)

2016-09-07 21:35:14 +02:00

quests_glastheim.txt

Follow up 61a57668ed30b30b2eb43798e97d5f82e3610cde

2016-09-15 09:38:19 +07:00

quests_izlude.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

quests_lighthalzen.txt

Implemented Wolfchev's Laboratory instance. (credits: Hercules 1a477c4)

2014-05-13 15:34:56 -04:00

quests_malangdo.txt

Follow up to c23688c

2016-03-26 10:52:30 +07:00

quests_malaya.txt

Corrected OnTouch/OnTouch_ in NPC script (#1548)

2016-09-07 21:35:14 +02:00

quests_mora.txt

Revert "Corrected Mora Daily Quest Job EXP formula"

2016-09-08 13:18:52 +07:00

quests_morocc.txt

Added official names as comments in many newer scripts.

2014-01-22 15:59:21 -05:00

quests_nameless.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00

quests_veins.txt

Changed all "Compatible With" fields to "rAthena Project".

2014-01-12 16:24:38 -05:00