Vincent-Michael a508ce1976 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp

2014-07-05 14:28:58 +02:00

..

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

cs_account.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-23 23:47:48 +02:00

cs_achievement.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_arena.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_ban.cpp

Core/Battle.net: Implemented authserver

2014-05-06 23:43:29 +02:00

cs_battlenet_account.cpp

Core/Misc: Warning fixes

2014-06-12 17:51:57 +02:00

cs_bf.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_cast.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_character.cpp

Core/Battle.net: Implemented authserver

2014-05-06 23:43:29 +02:00

cs_cheat.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-04-29 20:14:42 +02:00

cs_debug.cpp

Core: Fix warnings

2014-06-28 22:43:35 +02:00

cs_deserter.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_disable.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_event.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_gm.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-04-29 20:14:42 +02:00

cs_go.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-28 21:07:41 +02:00

cs_gobject.cpp

Core: Fix warnings

2014-06-28 22:43:35 +02:00

cs_group.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_guild.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

cs_honor.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_instance.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_learn.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-07-05 14:28:58 +02:00

cs_lfg.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_list.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-04-29 20:14:42 +02:00

cs_lookup.cpp

Core/Battle.net: Implemented authserver

2014-05-06 23:43:29 +02:00

cs_message.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

cs_misc.cpp

Core/Phases: Removed some phasemask handling, more to come

2014-06-02 17:43:59 -05:00

cs_mmaps.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-04-29 20:14:42 +02:00

cs_modify.cpp

Core/Scripts: Re-add the modify currency command, accidentally removed in fca4a5448a

2014-06-20 13:53:44 -05:00

cs_npc.cpp

Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2014-06-18 23:25:57 -04:00

cs_pet.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_quest.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_rbac.cpp

Core/Battle.net: Implemented authserver

2014-05-06 23:43:29 +02:00

cs_reload.cpp

Core/Creature: Added missing part in ff9cd652e0

2014-06-21 22:46:51 +02:00

cs_reset.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-04-29 20:14:42 +02:00

cs_send.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_server.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_tele.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

cs_ticket.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

cs_titles.cpp

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-04-29 20:14:42 +02:00

cs_wp.cpp

Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4

2014-06-01 22:27:29 -05:00