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

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp

2013-06-11 22:07:11 +02:00

..

CMakeLists.txt

Implement .arena commands - add new commands to the core to handle with arena teams.

2013-05-22 00:50:51 +03:00

cs_account.cpp

* Batch of fixes for issues found by static analysis.

2013-05-17 21:11:18 -05:00

cs_achievement.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_arena.cpp

Core: Fix warnings

2013-05-24 17:39:30 +02:00

cs_ban.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_bf.cpp

Update more copyright note for 2013.

2013-01-01 15:35:09 +01:00

cs_cast.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_character.cpp

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

cs_cheat.cpp

Core/Movement

2013-04-09 17:24:39 +02:00

cs_debug.cpp

Merge branch 'master' into 4.3.4 (Only the Logging System One)

2013-05-21 09:55:09 +02:00

cs_deserter.cpp

Core: Fix compiler warnings

2013-05-16 01:10:53 +01:00

cs_disable.cpp

Merge pull request #8826 from joschiwald/mmaps_disable

2013-01-07 07:52:35 -08:00

cs_event.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_gm.cpp

Core/Movement

2013-04-09 17:24:39 +02:00

cs_go.cpp

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

cs_gobject.cpp

Merge branch 'master' into 4.3.4 (Only the Logging System One)

2013-05-21 09:55:09 +02:00

cs_guild.cpp

Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)

2013-05-21 09:41:13 +02:00

cs_honor.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_instance.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_learn.cpp

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

cs_lfg.cpp

Core/Dungeon Finder: Use lfg namespace to encapsulate all LFG classes, structs and enums

2013-02-04 04:43:50 +01:00

cs_list.cpp

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

cs_lookup.cpp

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

cs_message.cpp

Core: Fix warnings

2013-03-18 23:38:07 +01:00

cs_misc.cpp

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

2013-06-03 18:19:18 +02:00

cs_mmaps.cpp

Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes

2013-05-21 08:37:28 +02:00

cs_modify.cpp

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

cs_npc.cpp

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00

cs_quest.cpp

Core/Quests: Implemented quest flag forcing the player to be flagged for PvP as long as the quest is in his log.

2013-02-26 17:14:13 +01:00

cs_rbac.cpp

Core/Misc: Another batch of fixes for issues found by static analysis

2013-05-17 21:30:02 +02:00

cs_reload.cpp

Merge branch 'master' into 4.3.4 (Only the Logging System One)

2013-05-21 09:55:09 +02:00

cs_reset.cpp

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

2013-06-11 22:07:11 +02:00

cs_server.cpp

Core/Misc: Another batch of fixes for issues found by static analysis

2013-05-30 13:18:29 +02:00

cs_tele.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

cs_ticket.cpp

Core/Tickets

2013-05-11 11:19:57 +02:00

cs_titles.cpp

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

cs_wp.cpp

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02:00