Arthur Ice cff96b23a8 Merge branch 'master' into RunQueryToDatabaseQuery_database ...

Conflicts:
	changelog.txt
	common/spdat.h
	zone/attack.cpp
	zone/bonuses.cpp
	zone/common.h
	zone/mob.h
	zone/special_attacks.cpp
	zone/spell_effects.cpp

2014-07-10 14:15:05 -07:00

..

glm

Merge from master stuff

2014-05-23 16:10:23 -07:00

patches

** Fix for RoF clients not displaying Augment Restrictions in the Item Info window.

2014-03-18 13:57:49 -07:00

SocketLib

NULL to nullptr

2013-05-04 18:06:58 -07:00

StackWalker

NULL to nullptr

2013-05-04 18:06:58 -07:00

tinyxml

NULL to nullptr

2013-05-04 18:06:58 -07:00

base_data.h

Base data for hp/mana/end calcs, mostly but not completely correct

2013-10-18 00:09:00 -07:00

BasePacket.cpp

Remove 'using namespaces std' fixes #61

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

BasePacket.h

Change space indentation to tabs

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

bodytypes.h

Change space indentation to tabs

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

breakdowns.h

Change space indentation to tabs

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

classes.cpp

Change space indentation to tabs

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

classes.h

Change space indentation to tabs

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

clientversions.h

Client version is now returned by the stream proxy as a number.

2013-02-17 18:09:31 +00:00

CMakeLists.txt

Database interface improvement with stl style iterators

2014-06-18 15:58:26 -07:00

Condition.cpp

weird #ifdef pattern, reorganized and cleaned it up. easier to understand now.

2013-05-21 00:36:34 -07:00

Condition.h

Change space indentation to tabs

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

crash.cpp

Change space indentation to tabs

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

crash.h

svn -> git Migration

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

crc32.cpp

Change space indentation to tabs

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

crc32.h

Remove trailing whitespace

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

CRC16.cpp

Change space indentation to tabs

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

CRC16.h

Changed return type of CRC16 to uint16

2013-04-28 19:09:48 +01:00

database.cpp

SetMQDetectionFlag converted to StringFormat

2014-07-09 16:37:21 -07:00

database.h

Removed unused FetchRowMap

2014-07-08 21:10:01 -07:00

dbasync.cpp

Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.

2013-08-29 15:46:40 -07:00

dbasync.h

Remove trailing whitespace

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

dbcore.cpp

string based QueryDatabase

2014-07-08 21:10:01 -07:00

dbcore.h

string based QueryDatabase

2014-07-08 21:10:01 -07:00

dbmemshare.cpp

Change space indentation to tabs

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

debug.cpp

CMake flags to defining what is logged and where

2014-04-20 17:46:43 -07:00

debug.h

Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.

2013-08-29 15:46:40 -07:00

deity.h

Fix for compile failure in deity.h - Thanks V! (I should write a book on gcc:vs differences..I have found almost all of them...)

2013-10-30 03:49:32 -04:00

emu_opcodes.cpp

Change space indentation to tabs

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

emu_opcodes.h

Change space indentation to tabs

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

emu_oplist.h

Added prelim work on OP_Marquee incase anyone else wants to also have a go at it. Packet and opcode for SoD client figured out partially.

2013-12-22 22:37:41 -08:00

EmuTCPConnection.cpp

Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.

2014-07-08 21:09:55 -07:00

EmuTCPConnection.h

Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.

2014-07-08 21:09:55 -07:00

EmuTCPServer.cpp

Change space indentation to tabs

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

EmuTCPServer.h

Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc

2013-03-03 16:17:06 -08:00

eq_constants.h

** Fix for RoF clients not displaying Augment Restrictions in the Item Info window.

2014-03-17 04:53:47 -04:00

eq_packet_structs.h

Identified the opcode/struct for guild ranks in Rain of Fear+ clients and created a temporary workaround for permissions until full DB support is added for the new permissions system.

2014-05-17 23:33:35 -04:00

EQDB.cpp

Change space indentation to tabs

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

EQDB.h

Remove 'using namespaces std' fixes #61

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

EQDBRes.cpp

Remove 'using namespaces std' fixes #61

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

EQDBRes.h

Remove 'using namespaces std' fixes #61

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

eqemu_exception.cpp

Change space indentation to tabs

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

eqemu_exception.h

Fix several GCC warnings

2013-05-23 20:22:42 -04:00

EQEmuConfig_elements.h

svn -> git Migration

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

EQEmuConfig.cpp

Remove 'using namespaces std' fixes #61

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

EQEmuConfig.h

Changed a bunch of lua stuff, as well as modified a bunch of generic item quest stuff

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

EQEMuError.cpp

Change space indentation to tabs

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

EQEMuError.h

Change space indentation to tabs

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

EQNetwork.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

EQNetwork.h

Remove 'using namespaces std' fixes #61

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

EQPacket.cpp

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

EQPacket.h

Remove 'using namespaces std' fixes #61

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

EQStream.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

EQStream.h

Added cmake options to alter eqstream settings if one would so wish.

2014-02-12 15:51:20 -08:00

EQStreamFactory.cpp

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

2014-02-16 19:16:45 -05:00

EQStreamFactory.h

Fixed a performance issue involving std::string and EQStream identification.

2014-02-15 23:50:32 -05:00

EQStreamIdent.cpp

Post-inc to pre-inc

2014-02-16 00:17:25 -05:00

EQStreamIdent.h

Change space indentation to tabs

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

EQStreamIntf.h

Remove trailing whitespace

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

EQStreamLocator.h

Post-inc to pre-inc

2014-02-16 00:17:25 -05:00

EQStreamProxy.cpp

Change space indentation to tabs

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

EQStreamProxy.h

Change space indentation to tabs

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

EQStreamType.h

svn -> git Migration

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

eqtime.cpp

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

eqtime.h

Remove 'using namespaces std' fixes #61

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

errmsg.h

Change space indentation to tabs

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

extprofile.cpp

Change space indentation to tabs

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

extprofile.h

Converted MATERIAL defines to MaterialUseSlots enumeration

2013-10-27 08:01:37 -04:00

faction.cpp

Change space indentation to tabs

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

faction.h

Change space indentation to tabs

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

features.h

Added options to CMake to disable GM command logging or disable logging entirely while keeping GM commands enabled.

2013-11-18 23:49:12 -05:00

fixed_memory_hash_set.h

Change space indentation to tabs

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

fixed_memory_variable_hash_set.h

Change space indentation to tabs

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

guild_base.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

guild_base.h

Remove trailing whitespace

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

guilds.cpp

Change space indentation to tabs

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

guilds.h

Change space indentation to tabs

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

ipc_mutex.cpp

Darwin caused ipc mutex to stop working for non-darwin, non-windows systems. Hopefully fixed

2014-04-25 18:45:19 -07:00

ipc_mutex.h

Change space indentation to tabs

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

item_fieldlist.h

svn -> git Migration

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

item_struct.h

Change space indentation to tabs

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

Item.cpp

StringFormat converted to move semantics

2014-07-08 21:09:55 -07:00

Item.h

Re-arranged Item.cpp functions to match their declaration order in Item.h (prep for upcoming changes)

2014-05-12 03:06:13 -04:00

languages.h

Change space indentation to tabs

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

linked_list.h

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

logsys_eqemu.cpp

StringFormat converted to move semantics

2014-07-08 21:09:55 -07:00

logsys.cpp

Change space indentation to tabs

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

logsys.h

Added options to CMake to disable GM command logging or disable logging entirely while keeping GM commands enabled.

2013-11-18 23:49:12 -05:00

logtypes.h

Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.

2014-07-08 21:09:55 -07:00

loottable.h

Change space indentation to tabs

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

mail_oplist.h

svn -> git Migration

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

MaxSkill.cpp

Change space indentation to tabs

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

md5.cpp

Merge branch 'master' into StringFormatting.

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

md5.h

Remove trailing whitespace

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

memory_mapped_file.cpp

Merge conflicts

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

memory_mapped_file.h

Change space indentation to tabs

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

misc.cpp

Remove 'using namespaces std' fixes #61

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

misc.h

Remove 'using namespaces std' fixes #61

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

MiscFunctions.cpp

Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.

2013-08-29 15:46:40 -07:00

MiscFunctions.h

Added options to CMake to disable GM command logging or disable logging entirely while keeping GM commands enabled.

2013-11-18 23:49:12 -05:00

moremath.cpp

Change space indentation to tabs

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

moremath.h

Change space indentation to tabs

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

Mutex.cpp

Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.

2013-08-29 15:46:40 -07:00

Mutex.h

Change space indentation to tabs

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

MySQLRequestResult.cpp

Added FieldName for column name requests

2014-07-08 21:10:01 -07:00

MySQLRequestResult.h

Added FieldName for column name requests

2014-07-08 21:10:01 -07:00

MySQLRequestRow.cpp

Missing return value

2014-07-08 21:09:56 -07:00

MySQLRequestRow.h

Hopefully fix compile issue with some VS versions

2014-07-08 21:09:56 -07:00

op_codes.h

svn -> git Migration

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

opcode_dispatch.h

Remove trailing whitespace

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

opcode_map.cpp

Remove 'using namespaces std' fixes #61

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

opcodemgr.cpp

Remove 'using namespaces std' fixes #61

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

opcodemgr.h

Remove 'using namespaces std' fixes #61

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

packet_dump_file.cpp

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

packet_dump_file.h

Remove 'using namespaces std' fixes #61

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

packet_dump.cpp

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

packet_dump.h

Change space indentation to tabs

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

packet_functions.cpp

Remove 'using namespaces std' fixes #61

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

packet_functions.h

Change space indentation to tabs

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

packetfile.cpp

Remove 'using namespaces std' fixes #61

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

packetfile.h

Remove trailing whitespace

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

perl_EQDB.cpp

Change space indentation to tabs

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

perl_EQDBRes.cpp

Remove 'using namespaces std' fixes #61

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

platform.cpp

Change space indentation to tabs

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

platform.h

Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.

2014-07-08 21:09:55 -07:00

ProcLauncher.cpp

Windows compile fix

2013-05-23 00:55:29 -07:00

ProcLauncher.h

Change space indentation to tabs

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

profiler.h

Change space indentation to tabs

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

ptimer.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

ptimer.h

Remove 'using namespaces std' fixes #61

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

queue.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

races.cpp

Change space indentation to tabs

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

races.h

Change space indentation to tabs

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

rdtsc.cpp

Fix several GCC warnings

2013-05-23 20:22:42 -04:00

rdtsc.h

Change space indentation to tabs

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

rulesys.cpp

Fix database scheme comments that got clobbered on nullptr conversion

2013-11-11 15:37:20 -05:00

rulesys.h

Change space indentation to tabs

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

ruletypes.h

Implemented SE_HeadShot, SE_HeadShotLevel - Defines headshot damage and level requirements.

2014-07-08 21:09:54 -07:00

seperator-2.h

Change space indentation to tabs

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

seperator.h

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

serverinfo.cpp

Change space indentation to tabs

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

serverinfo.h

Change space indentation to tabs

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

servertalk.h

Fix several GCC warnings

2013-05-23 20:22:42 -04:00

shareddb.cpp

Fix for crash in loading loot drops when you hit the actual lootdrop entry limit of 1260

2014-05-09 15:06:33 -07:00

shareddb.h

Merge branch 'master' into base_data

2013-11-06 13:18:20 -08:00

skills.h

Client patch prep work for extending usable skill range

2013-10-28 05:00:49 -04:00

spdat.cpp

Implemented SE_LimitSpellClass - Focus Limits spell to pre defined categories. (3=Cures,3=Offensive, 6=Lifetap)

2014-07-08 21:09:57 -07:00

spdat.h

Changed SE_LimitMaxMana to SE_MeleeVulnerability - Weakness/Mitigation verse melee damage

2014-07-08 21:09:57 -07:00

StringUtil.cpp

StringFormat converted to move semantics

2014-07-08 21:09:55 -07:00

StringUtil.h

StringFormat converted to move semantics

2014-07-08 21:09:55 -07:00

StructStrategy.cpp

Remove 'using namespaces std' fixes #61

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

StructStrategy.h

Remove trailing whitespace

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

TCPBasicServer.h

svn -> git Migration

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

TCPConnection.cpp

Changes for intel Mac OSX build

2014-04-03 14:10:03 -07:00

TCPConnection.h

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

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

TCPServer.cpp

Apparently 0 is a vaid file descriptor in OSX

2014-04-19 21:45:54 -07:00

TCPServer.h

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

timeoutmgr.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

timeoutmgr.h

Remove 'using namespaces std' fixes #61

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

timer.cpp

Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.

2013-08-29 15:46:40 -07:00

timer.h

Many fixes to regressions in perl and cleaning up the final interface

2013-06-12 15:04:26 -07:00

types.h

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

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

unix.cpp

Change space indentation to tabs

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

unix.h

Change space indentation to tabs

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

useperl.h

Change space indentation to tabs

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

version.h

Change space indentation to tabs

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

win_getopt.cpp

svn -> git Migration

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

win_getopt.h

svn -> git Migration

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

worldconn.cpp

Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.

2013-08-29 15:46:40 -07:00

worldconn.h

Change space indentation to tabs

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

XMLParser.cpp

Remove 'using namespaces std' fixes #61

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

XMLParser.h

Remove 'using namespaces std' fixes #61

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

ZoneNumbers.h

svn -> git Migration

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