Arthur Ice f1a487f606 Merge branch 'master' into StringFormatting. ...

Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp

2013-05-19 18:56:21 -07:00

..

AA.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

AA.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

aggro.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

attack.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

basic_functions.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

beacon.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

beacon.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

bonuses.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

bot.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

bot.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

botspellsai.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

botStructs.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

client_logs.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

client_logs.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

client_mods.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

client_packet.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

client_packet.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

client_process.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

client.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

client.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

CMakeLists.txt

Merge conflicts

2013-05-15 13:22:46 -07:00

command.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

command.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

common.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

doors.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

doors.h

Remove trailing whitespace

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

effects.cpp

Merge conflicts

2013-05-15 13:22:46 -07:00

embparser.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

embparser.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

embperl.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

embperl.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

embxs.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

embxs.h

Remove trailing whitespace

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

entity.cpp

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

2013-05-19 16:19:22 -07:00

entity.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

errmsg.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

event_codes.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

exp.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

fearpath.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

forage.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

forage.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

groups.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

groups.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

guild_mgr.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

guild_mgr.h

Remove trailing whitespace

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

guild.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

hate_list.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

hate_list.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

horse.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

horse.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

inventory.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

loottables.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

Map.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

map.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

masterentity.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

maxskill.h

Remove trailing whitespace

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

merc.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

merc.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

message.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

mob.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

mob.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

MobAI.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

mod_functions_base.cpp

Dungeon Crawl custom code merge

2013-04-24 15:58:51 -05:00

mod_functions.cpp

Dungeon Crawl custom code merge

2013-04-24 15:58:51 -05:00

net.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

net.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

npc.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

npc.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

NpcAI.cpp

svn -> git Migration

2013-02-16 16:14:39 -08:00

NpcAI.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

Object.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

object.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

oldcode.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

oldcode.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

parser.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

parser.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

pathing.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

pathing.h

Remove trailing whitespace

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

perl_client.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_doors.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_entity.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_groups.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_hateentry.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_mob.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_npc.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_object.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_perlpacket.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_PlayerCorpse.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_questitem.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_raids.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perlpacket.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perlpacket.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perlparser.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perlparser.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

petitions.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

petitions.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

pets.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

pets.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

PlayerCorpse.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

PlayerCorpse.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

QGlobals.cpp

moved string functions from MiscFunctions to StringUtil

2013-05-11 00:05:11 -07:00

QGlobals.h

Remove trailing whitespace

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

Quest.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

Quest.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

QuestInterface.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

questmgr.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

questmgr.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

QuestParserCollection.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

QuestParserCollection.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

queues.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

raid.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

raids.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

raids.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

skills.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

spawn2.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

spawn2.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

spawngroup.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

spawngroup.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

special_attacks.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

spell_effects.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

spells.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

StringIDs.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

tasks.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

tasks.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

titles.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

titles.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

tradeskills.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

trading.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

trap.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

trap.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

tribute.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

updatemgr.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

updatemgr.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

watermap.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

watermap.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

waypoints.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

worldserver.cpp

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

2013-05-19 16:19:22 -07:00

worldserver.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zone_logsys.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zone_profile.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zone_profile.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zone.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

zone.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

ZoneConfig.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

ZoneConfig.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zonedb.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

zonedb.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zonedbasync.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

zonedbasync.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

zonedump.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zoning.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00