Akkadius c5447778a6 Merge remote-tracking branch 'remotes/origin/master' into logging_changes ...

Conflicts:
	world/client.cpp
	world/worlddb.cpp
	zone/aggro.cpp
	zone/bot.cpp
	zone/client.cpp
	zone/client_packet.cpp
	zone/client_process.cpp
	zone/doors.cpp
	zone/entity.cpp
	zone/inventory.cpp
	zone/mob_ai.cpp
	zone/perl_client.cpp
	zone/spells.cpp
	zone/waypoints.cpp
	zone/zone.cpp
	zone/zonedb.cpp
	zone/zoning.cpp

2015-01-21 17:29:30 -06:00

..

makepatch

More 'dictionary' updates..added 'constants' files to client translators..started replacement of hard-coded inventory values.

2014-07-27 20:35:43 -04:00

patches.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

patches.h

svn -> git Migration

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

rof2_constants.h

It helps if you actually push more than the changelog message...

2015-01-05 13:50:03 -05:00

rof2_itemfields.h

(RoF+) Implemented the 6th Augment Slot for Items.

2014-12-15 17:55:23 -06:00

rof2_ops.h

Added text link translators for OP_Emote

2015-01-10 13:50:48 -05:00

rof2_structs.h

Mercenaries now load directly from tables only. The vwMercNpcTypes view is no longer required and can be deleted.

2015-01-07 22:20:44 -06:00

rof2.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

rof2.h

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05:00

rof_constants.h

It helps if you actually push more than the changelog message...

2015-01-05 13:50:03 -05:00

rof_itemfields.h

(RoF+) Implemented the 6th Augment Slot for Items.

2014-12-15 17:55:23 -06:00

rof_ops.h

Added text link translators for OP_Emote

2015-01-10 13:50:48 -05:00

rof_structs.h

Rework of the text link translator code (Known bug with broadcast message link size not in OP_ChannelMessage or OP_SpecialMesg)

2015-01-06 23:19:41 -05:00

rof.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

rof.h

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05:00

sod_constants.h

It helps if you actually push more than the changelog message...

2015-01-05 13:50:03 -05:00

sod_itemfields.h

Tons of renames

2014-08-21 19:33:02 -07:00

sod_ops.h

Added text link translators for OP_TaskDescription (Ti thru UF..RoF+ in-work)

2015-01-11 15:49:54 -05:00

sod_structs.h

Rework of the text link translator code (Known bug with broadcast message link size not in OP_ChannelMessage or OP_SpecialMesg)

2015-01-06 23:19:41 -05:00

sod.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

sod.h

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05:00

sof_constants.h

It helps if you actually push more than the changelog message...

2015-01-05 13:50:03 -05:00

sof_itemfields.h

Tons of renames

2014-08-21 19:33:02 -07:00

sof_opcode_list.h

Rename OP_BuffFadeMsg to OP_ColoredText since it is a generic opcode

2014-09-24 12:22:06 -04:00

sof_ops.h

Added text link translators for OP_TaskDescription (Ti thru UF..RoF+ in-work)

2015-01-11 15:49:54 -05:00

sof_structs.h

Rework of the text link translator code (Known bug with broadcast message link size not in OP_ChannelMessage or OP_SpecialMesg)

2015-01-06 23:19:41 -05:00

sof.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

sof.h

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05:00

ss_declare.h

Tons of renames

2014-08-21 19:33:02 -07:00

ss_define.h

Remove Log.Hex references because we're not going to use them anyways per KLS

2015-01-19 02:30:36 -06:00

ss_register.h

Tons of renames

2014-08-21 19:33:02 -07:00

template_constants.h

More 'dictionary' updates..added 'constants' files to client translators..started replacement of hard-coded inventory values.

2014-07-27 20:35:43 -04:00

template_ops.h

svn -> git Migration

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

template_structs.h

svn -> git Migration

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

template.cpp

Convert netcode debugging _log to logger.LogDebugType

2015-01-12 21:45:49 -06:00

template.h

Tons of renames

2014-08-21 19:33:02 -07:00

titanium_constants.h

It helps if you actually push more than the changelog message...

2015-01-05 13:50:03 -05:00

titanium_itemfields.h

Tons of renames

2014-08-21 19:33:02 -07:00

titanium_ops.h

Added text link translators for OP_TaskDescription (Ti thru UF..RoF+ in-work)

2015-01-11 15:49:54 -05:00

titanium_structs.h

Rework of the text link translator code (Known bug with broadcast message link size not in OP_ChannelMessage or OP_SpecialMesg)

2015-01-06 23:19:41 -05:00

titanium.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

titanium.h

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05:00

underfoot_constants.h

It helps if you actually push more than the changelog message...

2015-01-05 13:50:03 -05:00

underfoot_itemfields.h

Tons of renames

2014-08-21 19:33:02 -07:00

underfoot_ops.h

Added text link translators for OP_TaskDescription (Ti thru UF..RoF+ in-work)

2015-01-11 15:49:54 -05:00

underfoot_structs.h

Rework of the text link translator code (Known bug with broadcast message link size not in OP_ChannelMessage or OP_SpecialMesg)

2015-01-06 23:19:41 -05:00

underfoot.cpp

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 17:29:30 -06:00

underfoot.h

Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration

2015-01-19 23:32:57 -05:00