Akkarinage 3bd3b81749 Merge remote-tracking branch 'remotes/rAthena/master' ...

Conflicts:
	src/map/guild.c

2014-01-12 19:19:05 +00:00

..

airports

Global_Function updates.

2014-01-03 20:13:44 -05:00

battleground

* Implemented VIP system in many official scripts.

2013-11-18 23:54:17 -05:00

cities

Global_Function updates.

2014-01-03 20:13:44 -05:00

custom

Follow-up to Global_Function updates (97687ca).

2014-01-04 13:42:16 -05:00

events

Added iRO's Halloween Event 2013

2014-01-12 18:17:22 +00:00

guild

Fixed bug #8110:

2013-10-09 00:37:09 +08:00

guild2

Global_Function updates.

2014-01-03 20:13:44 -05:00

instances

Global_Function updates.

2014-01-03 20:13:44 -05:00

jobs

Implemented Kagerou/Oboro job change quest.

2014-01-11 22:37:36 -05:00

kafras

* Implemented VIP system in many official scripts.

2013-11-18 23:54:17 -05:00

mapflag

Fixed bugreport http://rathena.org/board/tracker/issue-8334-the-mapflag-of-monk-in-should-exclude-nosavesavepoint/

2013-12-13 13:27:32 +07:00

merchants

Global_Function updates.

2014-01-03 20:13:44 -05:00

mobs

* Script updates:

2013-08-05 19:42:00 -04:00

other

Implemented Kagerou/Oboro job change quest.

2014-01-11 22:37:36 -05:00

pre-re

Global_Function updates.

2014-01-03 20:13:44 -05:00

quests

Implemented Kagerou/Oboro job change quest.

2014-01-11 22:37:36 -05:00

re

Implemented Kagerou/Oboro job change quest.

2014-01-11 22:37:36 -05:00

test

Check_db

2014-01-09 00:08:00 -05:00

warps

* Cleaned up some unnecessary global ($) and temporary character (@) variables in scripts.

2013-09-06 19:37:14 -04:00

scripts_athena.conf

fml fat-fingers.

2014-01-12 18:26:43 +00:00

scripts_custom.conf

* Added "Hunting Missions" custom script (npc\custom\quests\hunting_missions.txt)

2012-09-15 19:41:18 +00:00

scripts_guild.conf

* You may notice that your /guild2/ folder shrunk considerably - you're welcome. x.x

2012-08-03 21:28:27 +00:00

scripts_jobs.conf

* Changed remaining bEquipmentMatk bonuses to bMatk in item_combo_db (follow-up r16981).

2013-02-02 05:45:09 +00:00

scripts_mapflags.conf

* Follow-up cd9a776: documentation edits.

2013-08-30 17:03:08 -04:00

scripts_monsters.conf

* Script updates:

2013-08-05 19:42:00 -04:00

scripts_test.conf

Check_db

2014-01-09 00:08:00 -05:00

scripts_warps.conf

* Restored Izlude Arena into root directory - it should never have been disabled in Renewal. (blame: r16382)

2013-08-06 02:58:43 -04:00