Uleat cf80e594bc Merge branch 'master' of https://github.com/EQEmu/Server into lsid ...

# Conflicts:
#	common/ruletypes.h
#	world/net.cpp
#	zone/bot_command.cpp
#	zone/command.cpp
#	zone/zonedb.cpp

2019-09-12 01:54:37 -04:00

..

combat-sim

Rework combat to make use of a struct to fix some bugs

2017-01-28 19:38:44 -05:00

defaults

Remove more defaults

2019-06-09 23:38:42 -05:00

deprecated

Refactor message functions

2019-08-11 00:14:02 -05:00

doc_scripts/perlparse

Added perparlse and cleaned up some argument names in embparser

2018-01-13 19:10:51 -08:00

EQExtractor2

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

mods

Add Critical Hit range (default 80) to legacy_combat.lua and fix a variable in Pet Criticals

2017-06-26 00:12:56 -05:00

patches

Add OP_TaskRequestTimer to patch files

2018-05-15 22:12:18 -04:00

scripts

Merge pull request #895 from mibastian/patch-1

2019-09-07 18:11:45 -05:00

sql

Merge branch 'master' of https://github.com/EQEmu/Server into lsid

2019-09-12 01:54:37 -04:00

TaskMaster

Rename activities to task_activities for consistency since we're changing up task data

2018-07-10 00:26:53 -05:00

xmltojson

Added xmltojson windows binaries

2017-07-15 21:59:50 -07:00