Lemongrass3110 e815efb565 Merge branch 'master' into feature/array_sort ...

# Conflicts:
#	src/map/script.cpp

2024-06-13 01:30:52 +02:00

..

airports

Merge branch 'master' into feature/array_sort

2024-06-13 01:30:52 +02:00

battleground

General typos (#8000)

2023-11-10 12:51:01 -05:00

cities

General typos (#8000)

2023-11-10 12:51:01 -05:00

custom

General typos (#8000)

2023-11-10 12:51:01 -05:00

events

General typos (#8000)

2023-11-10 12:51:01 -05:00

guild

General typos (#8000)

2023-11-10 12:51:01 -05:00

guild2

Update agit_start_se.txt (#7448)

2022-11-30 22:07:43 +01:00

instances

Small correction in SealedShrine.txt (#6287)

2021-10-06 00:27:33 +02:00

jobs

General typos (#8000)

2023-11-10 12:51:01 -05:00

kafras

Small correction for checkre script command (#5550)

2020-11-16 17:51:30 +01:00

mapflag

Added returning to instances (#7622)

2023-03-23 15:49:39 +01:00

merchants

Initial version of cashmall (#7450)

2022-12-18 00:39:50 +01:00

mobs

Removes an invalid mob death event (#4821)

2020-04-19 14:07:01 -04:00

other

Added Siege_Teleport_Scroll2 function

2024-05-15 14:24:36 +01:00

pre-re

General typos (#8000)

2023-11-10 12:51:01 -05:00

quests

General typos (#8000)

2023-11-10 12:51:01 -05:00

re

Illusion of underwater cooldown (#8383)

2024-05-29 20:49:31 +02:00

test

Merge branch 'master' into feature/array_sort

2024-06-13 01:30:52 +02:00

warps

Implementing Stylist UI Script (#6506)

2022-01-20 01:07:20 +01:00

barters.yml

Initial release of barter shops (#6508)

2022-01-21 00:59:16 +01:00

scripts_athena.conf

Initial version of cashmall (#7450)

2022-12-18 00:39:50 +01:00

scripts_custom.conf

Update scripts_custom.conf

2014-12-02 18:35:33 -08:00

scripts_guild.conf

Fixed place names and other typos (#4475)

2019-12-15 20:55:19 +01:00

scripts_jobs.conf

Merged novice academie from Hercules 21564acf13

2015-11-16 00:34:00 +01:00

scripts_mapflags.conf

Missing nodynamicnpc on mapflag (#8357)

2024-05-24 15:28:07 +02:00

scripts_monsters.conf

Removed City Cleaners from RE monster spawn files (#3082)

2018-05-19 11:36:59 -04:00

scripts_test.conf

Documentation cleaning.

2014-08-31 12:09:38 -04: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