root 7fca5a7a89 Merge branch 'master' of https://github.com/EQEmu/Server into EQEmu-master ...

Conflicts:
	zone/client.h
	zone/mod_functions.cpp
	zone/mod_functions_base.cpp

2013-06-01 19:17:23 -05:00

..

AA.cpp

Merging

2013-05-23 00:31:02 -07:00

AA.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

aggro.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

attack.cpp

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

2013-06-01 19:17:23 -05:00

basic_functions.h

Change space indentation to tabs

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

beacon.cpp

removed visual studio 5,6,7 specific code except in tinyxml and StackWalker.

2013-05-20 22:40:10 -07:00

beacon.h

Change space indentation to tabs

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

bonuses.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

bot.cpp

added std:: to a lot of locations which where

2013-05-22 23:55:49 -07:00

bot.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

botspellsai.cpp

added std:: to a lot of locations which where

2013-05-22 23:55:49 -07:00

botStructs.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

client_logs.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

client_logs.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

client_mods.cpp

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

2013-06-01 19:17:23 -05:00

client_packet.cpp

Merge pull request #66 from j883376/gcc-changes

2013-05-24 01:16:10 -07:00

client_packet.h

Change space indentation to tabs

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

client_process.cpp

Merging

2013-05-23 00:31:02 -07:00

client.cpp

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

2013-06-01 19:17:23 -05:00

client.h

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

2013-06-01 19:17:23 -05:00

CMakeLists.txt

added std:: to a lot of locations which where

2013-05-22 23:55:49 -07:00

command.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04: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

Merging

2013-05-23 00:31:02 -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' of https://github.com/EQEmu/Server into EQEmu-master

2013-06-01 19:17:23 -05:00

embparser.h

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

2013-06-01 19:17:23 -05: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 git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

entity.h

added std:: to a lot of locations which where

2013-05-22 23:55:49 -07: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' of https://github.com/EQEmu/Server into EQEmu-master

2013-06-01 19:17:23 -05:00

fearpath.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

forage.cpp

Merge and a few cleanup / bug fixes

2013-05-23 12:35:00 -07:00

forage.h

Change space indentation to tabs

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

groups.cpp

Merging

2013-05-23 00:31:02 -07:00

groups.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

guild_mgr.cpp

Merging

2013-05-23 00:31:02 -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

Merging

2013-05-23 00:31:02 -07:00

horse.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

inventory.cpp

Merging

2013-05-23 00:31:02 -07:00

loottables.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

Map.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -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' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

merc.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

message.h

svn -> git Migration

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

mob.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

mob.h

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

2013-06-01 19:17:23 -05:00

MobAI.cpp

Merge and a few cleanup / bug fixes

2013-05-23 12:35:00 -07:00

mod_functions_base.cpp

Updated mod_functions and mod_functions_base with new hooks and descriptions

2013-06-01 10:44:32 -05:00

mod_functions.cpp

Updated mod_functions and mod_functions_base with new hooks and descriptions

2013-06-01 10:44:32 -05:00

net.cpp

Merge branch 'StringFormatting' into small_stage_cleanup

2013-05-22 18:55:06 -07:00

net.h

Change space indentation to tabs

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

npc.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

npc.h

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

2013-06-01 19:17:23 -05: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 and a few cleanup / bug fixes

2013-05-23 12:35:00 -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

Merging

2013-05-23 00:31:02 -07:00

parser.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

pathing.cpp

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

pathing.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -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

Fixed some mod function bugs and stat caps.

2013-05-27 15:32:59 -05: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

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -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

Merging

2013-05-23 00:31:02 -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

Merging

2013-05-23 00:31:02 -07:00

PlayerCorpse.h

Change space indentation to tabs

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

QGlobals.cpp

Function for retrieving a qglobal or list of them

2013-05-24 00:52:28 -07:00

QGlobals.h

Function for retrieving a qglobal or list of them

2013-05-24 00:52:28 -07: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' of https://github.com/EQEmu/Server into EQEmu-master

2013-06-01 19:17:23 -05:00

questmgr.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -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

Merging

2013-05-23 00:31:02 -07:00

raids.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

skills.h

Change space indentation to tabs

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

spawn2.cpp

Merging

2013-05-23 00:31:02 -07:00

spawn2.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

spawngroup.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

spawngroup.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

special_attacks.cpp

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

2013-06-01 19:17:23 -05:00

spell_effects.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

spells.cpp

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

2013-06-01 19:17:23 -05:00

StringIDs.h

Change space indentation to tabs

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

tasks.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

tasks.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

titles.cpp

Merging

2013-05-23 00:31:02 -07:00

titles.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

tradeskills.cpp

Merge and a few cleanup / bug fixes

2013-05-23 12:35:00 -07:00

trading.cpp

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00

trap.cpp

Merge and a few cleanup / bug fixes

2013-05-23 12:35:00 -07:00

trap.h

Change space indentation to tabs

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

tribute.cpp

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

2013-06-01 19:17:23 -05:00

updatemgr.cpp

Change space indentation to tabs

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

updatemgr.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -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 and a few cleanup / bug fixes

2013-05-23 12:35:00 -07:00

worldserver.cpp

Merging

2013-05-23 00:31:02 -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

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

zone_profile.h

Change space indentation to tabs

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

zone.cpp

Merging

2013-05-23 00:31:02 -07:00

zone.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

ZoneConfig.cpp

Change space indentation to tabs

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

ZoneConfig.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

zonedb.cpp

Merging

2013-05-23 00:31:02 -07:00

zonedb.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

zonedbasync.cpp

Merging

2013-05-23 00:31:02 -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' of git://github.com/EQEmu/Server into gcc-changes

2013-05-23 21:12:07 -04:00