josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,973 Commits 1 Branch 0 Tags
6eee75a4f76b1965708ee52fa785d8d7555c0a16
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael 4136f3c974 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ArenaTeamHandler.cpp
 2014-05-13 06:41:25 +02:00
Vincent-Michael cfe644b457 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Quests/QuestDef.cpp
 2014-05-11 23:08:54 +02:00
Vincent-Michael 37d2777f27 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-09 17:20:39 +02:00
Vincent-Michael b6a9e56193 DB/Gossip: Fix some gossip in dalaran 2014-05-09 03:19:37 +02:00
Vincent-Michael 33978774ff SQL: Rename in correct name 2014-05-08 23:36:28 +02:00
Vincent-Michael 2c48938c6d DB/Instance: Fix Ahn''Kahet exit (portal/areatrigger) 2014-05-08 23:36:21 +02:00
Vincent-Michael 45ead7fb87 SQL: Rename in correct name 2014-05-08 23:35:36 +02:00
Vincent-Michael 53edb30f06 DB/Instance: Fix Ahn''Kahet exit (portal/areatrigger) 2014-05-08 23:33:53 +02:00
Vincent-Michael 09ff96914a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-08 02:47:29 +02:00
Vincent-Michael 5ca548602c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-05 16:13:40 +02:00
Vincent-Michael b6bf83589c Core/Gameobject: Added missing break in 24ef7dbdf4 2014-05-05 10:06:44 +02:00
Vincent-Michael 49018c4bdb DB/CreatureTexts: Set some creature_text field BroadcastTextId to 0 because change on cata/mop 2014-05-04 12:12:01 +02:00
Vincent-Michael 3b9da8498f DB/CreatureTexts: Set some creature_text field BroadcastTextId to 0 because change on cata/mop 2014-05-04 12:10:52 +02:00
Vincent-Michael 5e3e431b06 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-04 04:24:59 +02:00
Vincent-Michael 13ec761ad2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.h
 2014-05-03 20:23:44 +02:00
Vincent-Michael 9a8cd0593c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-03 18:20:28 +02:00
Vincent-Michael 43c78c4a8e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-02 20:55:53 +02:00
Vincent-Michael e7eed54c10 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-01 22:20:55 +02:00
Vincent-Michael 0faf4b1b24 Core/Text: Fix typo in 5caf6aad98 2014-05-01 21:59:19 +02:00
Vincent-Michael 824ee30b7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2014-04-30 22:59:51 +02:00
Vincent-Michael 5caf6aad98 Core/Texts: 
* Fix creautre text with gender female
* Small cleanUp
* ObjectMgr.cpp/ObjectMgr.h part from joschi
 2014-04-30 22:15:28 +02:00
Vincent-Michael cdae208b9a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-30 09:19:57 +02:00
Vincent-Michael fb36d551d0 DB/Seasonal: 
* Added missing seasonal quest in game_event_seasonal_questrelation table
* Remove all event = 0 in character_queststatus_seasonal table
 2014-04-30 01:40:53 +02:00
Vincent-Michael 3ce6a9d5cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
 2014-04-29 20:14:42 +02:00
Vincent-Michael 796b77ca12 Scripts: Remove old script from azuregos 2014-04-29 14:17:30 +02:00
Vincent-Michael 0f049907d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-29 09:59:03 +02:00
Vincent-Michael 65ae868cc8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-04-28 23:00:41 +02:00
Vincent-Michael ba8959b733 Core/MSVC: Remove double warning disables 2014-04-28 22:44:56 +02:00
Vincent-Michael 4dfe3246fa Core: Fix warning 2014-04-28 22:32:01 +02:00
Vincent-Michael 6bc740f312 SQL: Fix typo (thx @cr4st) 2014-04-28 17:39:21 +02:00
Vincent-Michael d8a3d2ff0f DB/Command: Added missing data in 6045c05e0d 2014-04-28 16:52:51 +02:00
Vincent-Michael 1fd6210aa5 SQL: Update old .sql files to keep consistency with auth_database.sql 
Also update characters_database.sql (generated by mysqldump)
 2014-04-28 13:47:08 +02:00
Vincent-Michael 6045c05e0d DB/RBAC: Fix rbac_permissions order 2014-04-28 13:38:26 +02:00
Vincent-Michael 221fde5711 Core: Fix warning 2014-04-28 09:55:11 +02:00
Vincent-Michael f4fd258ad1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-28 09:49:24 +02:00
Vincent-Michael f743ca2816 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2014-04-28 09:42:20 +02:00
Vincent-Michael 57cf043aec Core/Creature: Missed changes in c536305e3a 2014-04-28 09:19:37 +02:00
Vincent-Michael a1e8cad703 Core/Creature: Added creature template log for default creature is greater than difficulty creature 2014-04-27 23:12:21 +02:00
Vincent-Michael f6e53e45a9 Core/Creature: Addet "possible fix" log for creature_template errors 2014-04-27 23:12:20 +02:00
Vincent-Michael a4dc654aea Core/Creature: Added creature template log for default creature is greater than difficulty creature 2014-04-27 23:11:11 +02:00
Vincent-Michael 2f4059e9b2 Core/Creature: Addet "possible fix" log for creature_template errors 2014-04-27 21:28:54 +02:00
Vincent-Michael 908870e23f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-27 13:56:56 +02:00
Vincent-Michael de281846cc Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 14:51:00 +02:00
Vincent-Michael 3ef7a7299f Core: Fix build 2014-04-26 13:07:00 +02:00
Vincent-Michael 5586950dec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 12:35:21 +02:00
Vincent-Michael dc4c67ab40 DB/Achievement: Fix last typo 2014-04-26 12:35:08 +02:00
Vincent-Michael 35798d7f9e I need Sleep (I failed today hard... :/ ) 2014-04-26 05:52:20 +02:00
Vincent-Michael ab85c1546f Core/Achievements: Fixed WoW''s 4th-8th Anniversary 2014-04-26 04:46:54 +02:00
Vincent-Michael 0242f04f1c Core: Fix build 2014-04-26 03:24:57 +02:00
Vincent-Michael 9dee56cb27 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 03:17:44 +02:00
Vincent-Michael f98866db3f Core: Fix warning 2014-04-26 03:16:53 +02:00
Vincent-Michael 3ec1d0c8d6 Core/Achievements: Implemented ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT 2014-04-26 03:07:49 +02:00
Vincent-Michael 0042e6f815 Revert "Core/Achievement: Fix typo in 68b508df27d20faeecf77933008f250b32f22392" 
This reverts commit a4e7ae8d20.
 2014-04-26 02:48:03 +02:00
Vincent-Michael a4e7ae8d20 Core/Achievement: Fix typo in 68b508df27 2014-04-26 02:45:37 +02:00
Vincent-Michael 68b508df27 Core/GameEvent: Use game_event table for blizzard birthday 2014-04-26 02:05:29 +02:00
Vincent-Michael 1390621f4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2014-04-25 23:42:40 +02:00
Vincent-Michael c81d6e9b4b Core/Texts: 
* Enable some BroadcastTexts stuff (is not finish)
* Added reload command for broadcast_text table
ToDo:
- Enable: Sound/Emote stuff, etc.
- Auth base need refresh
 2014-04-25 23:25:59 +02:00
Vincent-Michael b6e028eb35 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-25 08:42:40 +02:00
Vincent-Michael 49630f42d4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSession.cpp
 2014-04-24 22:02:46 +02:00
Vincent-Michael b39ba5656e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-23 20:05:45 +02:00
Vincent-Michael 3eb2d615f3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
 2014-04-23 06:22:39 +02:00
Vincent-Michael 5bb19ce017 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2014-04-22 20:06:40 +02:00
Vincent-Michael cec7c9f07e Misc/Guild: Fix guild_xp_for_level structure (startup errors) 2014-04-21 17:46:53 +02:00
Vincent-Michael f5b02d1278 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:57:46 +02:00
Vincent-Michael 3a26a570f7 Core: Fix whitespace / tabs 2014-04-21 16:57:32 +02:00
Vincent-Michael 0ab9f938ad Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:35:36 +02:00
Vincent-Michael d1618d2422 Core/Creature: Added better error output for wrong spawn mask 2014-04-21 01:09:43 +02:00
Vincent-Michael 81c99b3338 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/dbcfile.h
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/adtfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
 2014-04-20 22:54:39 +02:00
Vincent-Michael 40a29a3c99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
 2014-04-20 11:33:40 +02:00
Vincent-Michael aa6ae2773f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
 2014-04-19 22:49:25 +02:00
Vincent-Michael 8a110f2645 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-04-19 19:57:46 +02:00
Vincent-Michael 5454e10b52 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
 2014-04-11 23:12:12 +02:00
Vincent-Michael 4e59d0b922 Core/Chat: Fix build 2014-04-09 22:03:28 +02:00
Vincent-Michael 6131e4d722 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2014-04-09 21:03:08 +02:00
Vincent-Michael 5fd0e9783b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-08 17:27:41 +02:00
Vincent-Michael 1f7260ca4b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2014-04-07 20:42:44 +02:00
Vincent-Michael 19751f36f6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-06 01:25:59 +02:00
Vincent-Michael 4043680a5e Fix merge fail 2014-04-05 21:44:38 +02:00
Vincent-Michael e4b14b943d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Object/Object.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/Unit/Unit.h
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_character.cpp
	src/server/scripts/Commands/cs_lookup.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-04-05 20:43:05 +02:00
blub 62dd05fc8a Merge pull request #11823 from MitchesD/core_sai 
Core/SmartScripts: SMART_ACTION_EQUIP prevent to false errors
 2014-04-03 21:53:04 +02:00
Vincent-Michael bacfbdc4ee Core/Sai: Added new db errors :P (hihi) 2014-03-31 17:32:39 +02:00
Vincent-Michael 0b615ec159 Scripts/Misc: Small code optimizations 2014-03-29 20:58:49 +01:00
Vincent-Michael 4a5d7a395b DB/SAI: Fix "Badlands Enraged Rock Elemental" event spam 
Closes #11802
 2014-03-29 18:19:08 +01:00
Vincent-Michael b4dec55b96 Cmake: Added level restriction for msvc 2013 2014-03-24 15:54:40 +01:00
Vincent-Michael 899b6da4dc Update readme for cmake version for c++11 stuff 2014-03-24 14:37:23 +01:00
Vincent_Michael a5a6799b4e Scripts: Added missing stuff in 1d1aeda86c 2014-02-09 19:15:17 +01:00
Vincent_Michael 1d1aeda86c Core: Fix build 2014-02-09 19:01:56 +01:00
Vincent_Michael 79e30bbda4 Revert "DB/Misc: A lucky bag random fixes" 
This reverts commit 3fcb1bf091.
 2014-02-07 18:43:16 +01:00
Vincent_Michael b76e2db32e SQL: Maybe I'll have more luck :( 2014-02-07 17:32:38 +01:00
Vincent_Michael 3fcb1bf091 DB/Misc: A lucky bag random fixes 2014-02-07 17:10:59 +01:00
Vincent_Michael adc4b3b46b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2014-02-04 17:28:31 +01:00
Vincent_Michael 6b4e476111 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-02-01 21:18:28 +01:00
Vincent_Michael 822092ea15 DB/Creature: Fix warnings with creature_formations loading 2014-02-01 18:04:54 +01:00
Vincent_Michael 224da47952 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/scripts/Spells/spell_dk.cpp
 2014-01-31 23:51:07 +01:00
Vincent_Michael a7c15e7368 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-01-27 23:13:53 +01:00
Vincent_Michael 4567faa34b SQL: Rename in correct name 2014-01-27 23:12:45 +01:00
Vincent_Michael df6f300542 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Spells/spell_paladin.cpp
 2014-01-27 18:44:07 +01:00
Vincent_Michael ec020ea048 SQL: Rename in correct name 2014-01-27 06:26:48 +01:00
Vincent_Michael 7cc4828554 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/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-01-26 18:22:06 +01:00
Vincent_Michael 79a2a0c434 Core/Spell: Fix logic fail in 96ae4caf62 2014-01-26 16:42:02 +01:00