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

..

battleground.txt

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

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

gvg.txt

Follow up 26dcf345fe753dc43568bb118b6a22e2c93bc7bc

2016-02-28 18:17:49 +07:00

jail.txt

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

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

night.txt

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

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

nightmare.txt

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

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

nobranch.txt

Added mapflags in que_ba quest map

2016-03-03 00:10:18 +01:00

nocostume.txt

Initial release of nocostume map flag (#1137)

2016-09-06 11:34:36 +02:00

noicewall.txt

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

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

nomemo.txt

Added mapflags in que_ba quest map

2016-03-03 00:10:18 +01:00

nopenalty.txt

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

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

nopvp.txt

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

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

noreturn.txt

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

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

nosave.txt

Added mapflags in que_ba quest map

2016-03-03 00:10:18 +01:00

noskill.txt

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

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

noteleport.txt

Added mapflags in que_ba quest map

2016-03-03 00:10:18 +01:00

nowarp.txt

Added mapflags in que_ba quest map

2016-03-03 00:10:18 +01:00

nowarpto.txt

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

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

partylock.txt

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

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

pvp_noguild.txt

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

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

pvp_noparty.txt

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

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

pvp.txt

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

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

reset.txt

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

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

restricted.txt

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

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

skill_damage.txt

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

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

town.txt

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

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