Vincent_Michael
|
f31baacb10
|
SQL: LQS elif emaneR
|
2013-12-20 23:04:13 +01:00 |
|
Vincent_Michael
|
52a5213e46
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-12-20 17:26:42 +01:00 |
|
Vincent_Michael
|
736093e91b
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/scripts/Kalimdor/zone_silithus.cpp
|
2013-12-20 17:26:27 +01:00 |
|
Vincent_Michael
|
2ded11354d
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-12-18 23:48:20 +01:00 |
|
Vincent_Michael
|
f7aedaef33
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/World/World.cpp
|
2013-12-15 03:47:21 +01:00 |
|
Vincent_Michael
|
506ddbbf40
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-12-12 19:36:48 +01:00 |
|
Vincent_Michael
|
bb62a9180d
|
Core: Fix build
|
2013-12-11 20:48:40 +01:00 |
|
Vincent_Michael
|
07024d3ea8
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DataStores/DBCEnums.h
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
|
2013-12-11 20:34:44 +01:00 |
|
Vincent_Michael
|
fb26e18523
|
Core: Fix warnings
|
2013-12-11 20:30:15 +01:00 |
|
Vincent_Michael
|
ee5c47f1af
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-12-09 23:48:41 +01:00 |
|
Vincent_Michael
|
b76d141ce0
|
Core: Fix warning
|
2013-12-08 20:53:06 +01:00 |
|
Vincent_Michael
|
89f381b1ff
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-12-08 20:28:12 +01:00 |
|
Vincent_Michael
|
e8be55aa8b
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/CoreAI/TotemAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.h
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
|
2013-12-08 20:27:46 +01:00 |
|
Vincent_Michael
|
2ed05e487d
|
Core: Fix non pch build
|
2013-12-08 02:06:55 +01:00 |
|
Vincent_Michael
|
c2984e3dbc
|
Core/RBAC: Fix typo
|
2013-12-04 22:35:44 +01:00 |
|
Vincent_Michael
|
1bb4cf3ab6
|
Core/Misc: Removed more unused eventAI stuff
|
2013-12-01 02:06:37 +01:00 |
|
Vincent_Michael
|
59e4be69f4
|
Core/RBAC: Added missing changes in 6e13263c7a
|
2013-12-01 01:30:01 +01:00 |
|
Vincent_Michael
|
6e13263c7a
|
Core/AI: Good bye, Good bye my beloved EventAI system :(
|
2013-12-01 01:27:08 +01:00 |
|
Vincent_Michael
|
ff1d9eec02
|
DB/SAI: Fix db startup error
|
2013-11-27 20:10:53 +01:00 |
|
Vincent_Michael
|
b069ade49b
|
DB/Loot: Fix pilgrims bounty loot for cooking book
|
2013-11-25 19:50:23 +01:00 |
|
Vincent_Michael
|
7cd21549f6
|
Core: Fix build
|
2013-11-24 22:48:47 +01:00 |
|
Vincent_Michael
|
d4d4eb3123
|
Misc/Misc: A mix useless random changes
|
2013-11-24 20:54:28 +01:00 |
|
Vincent_Michael
|
9fd70663ab
|
SQL: Fix import error
|
2013-11-15 23:23:21 +01:00 |
|
Vincent_Michael
|
cbc9870b4a
|
SQL: Fix import errors
|
2013-11-14 21:01:03 +01:00 |
|
Vincent_Michael
|
9802c7b891
|
Scripts/Misc: Coding Style unification? (by Aokromes)
|
2013-10-22 20:24:05 +02:00 |
|
Vincent_Michael
|
8d6aec608f
|
Core/Spells: Fix warning
|
2013-10-20 00:40:20 +02:00 |
|
Vincent_Michael
|
5915a220a5
|
Misc: Removed some whitespace
|
2013-10-19 03:39:58 +02:00 |
|
Vincent_Michael
|
59caeb8b49
|
DB/Gossip: Added some missing gossips (Source: 5.4.0 sniffs)
|
2013-10-19 03:24:59 +02:00 |
|
Vincent_Michael
|
77013aa081
|
Core: Fix warnings
|
2013-10-18 13:31:09 +02:00 |
|
Vincent_Michael
|
47741f4fa6
|
Core/Object: Added more information for MovePosition log
|
2013-10-18 12:36:54 +02:00 |
|
Vincent_Michael
|
94161a8341
|
Core/Creature: Added log/change back to default speed for speed walk / run = 0 (Speed is never zero)
|
2013-10-18 12:35:11 +02:00 |
|
Vincent_Michael
|
ddada2d182
|
Scripted/ScarletMonastery: Fix crash for headless horseman
|
2013-10-18 12:25:50 +02:00 |
|
Vincent-Michael
|
a0b3863bd1
|
SQL: Update auth base
|
2013-10-17 12:17:47 +02:00 |
|
Vincent-Michael
|
9128088877
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-10-15 23:35:40 +02:00 |
|
Vincent-Michael
|
6d562b1248
|
Fix typo (thx to vlad852)
|
2013-10-10 07:31:42 +02:00 |
|
Vincent-Michael
|
904fa5b47b
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-10-09 23:14:16 +02:00 |
|
Vincent-Michael
|
4588294dd8
|
Fix some db errors ... (Yippie-Ya-Yeah)
|
2013-10-09 23:13:26 +02:00 |
|
Vincent-Michael
|
3611d82e62
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
|
2013-09-23 22:58:29 +02:00 |
|
Vincent-Michael
|
20d070172b
|
Core/Logs: Random changes
|
2013-09-23 22:55:35 +02:00 |
|
Vincent-Michael
|
f2dff3da38
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
|
2013-09-22 15:31:21 +02:00 |
|
Vincent-Michael
|
2b9b2a7388
|
DB/GameObject: Added gameobject "Dark Iron Mole Machine (Minion Summoner Trap)"
|
2013-09-20 13:16:04 +02:00 |
|
Vincent-Michael
|
eab10cc6ae
|
Core/Achievement: Fix warning
|
2013-09-18 23:47:35 +02:00 |
|
blub
|
ded94a41b2
|
Merge pull request #10874 from zorix/PR1
Core/Script:
|
2013-09-18 14:37:00 -07:00 |
|
Vincent-Michael
|
8af46f1c57
|
Core: Fix non pch build
|
2013-09-18 23:15:25 +02:00 |
|
Vincent-Michael
|
e740332c0b
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-09-15 23:20:13 +02:00 |
|
Vincent-Michael
|
b3d7b04714
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-09-14 23:10:32 +02:00 |
|
Vincent-Michael
|
85e49d0d14
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/worldserver/worldserver.conf.dist
|
2013-09-13 23:21:50 +02:00 |
|
Vincent-Michael
|
974bf5c427
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Accounts/RBAC.h
src/server/game/Battlegrounds/ArenaTeam.cpp
|
2013-09-11 22:35:45 +02:00 |
|
Vincent-Michael
|
653ff9b243
|
Core/RBAC: Update RBACPermissions enum with 4.3.4 branch
|
2013-09-10 19:55:06 +02:00 |
|
Vincent-Michael
|
5583bcfeea
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
|
2013-09-10 19:53:43 +02:00 |
|
Vincent-Michael
|
a5bcab16a9
|
DB/Creature: Removed hack in 356ba1e0ce
|
2013-09-10 18:55:03 +02:00 |
|
Vincent-Michael
|
ce742dc7a0
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Guilds/Guild.cpp
|
2013-09-09 18:26:31 +02:00 |
|
Vincent-Michael
|
fab0f461c0
|
Core/Condition: Added CONDITION_SOURCE_TYPE_PHASE_DEFINITION define for only 4.3.4 branch
|
2013-09-07 00:16:10 +02:00 |
|
Vincent-Michael
|
be75ddc2bd
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_npc.cpp
|
2013-09-06 21:55:19 +02:00 |
|
Vincent-Michael
|
bc1a079b6c
|
Core/SAI: Fix typo (i blame germans laziness)
|
2013-09-06 21:40:04 +02:00 |
|
Vincent-Michael
|
d25c2e7f5b
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Spells/SpellMgr.cpp
src/tools/map_extractor/loadlib.cpp
|
2013-09-05 16:46:14 +02:00 |
|
Vincent-Michael
|
458f5b9502
|
Core/SAI: Added SMART_ACTION_SUMMON_CREA / SMART_ACTION_SUMMON_GO log for has already summon spell
|
2013-09-05 16:16:23 +02:00 |
|
Vincent-Michael
|
6514e21b7c
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/System.cpp
|
2013-09-03 21:03:09 +02:00 |
|
Vincent-Michael
|
78c53bb032
|
Quest/SAI: Fix quest credit for quest "Monitoring the Rift: Cleftcliff Anomaly"
|
2013-09-02 23:28:59 +02:00 |
|
Vincent-Michael
|
611d51af98
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Commands/cs_debug.cpp
src/server/worldserver/worldserver.conf.dist
|
2013-09-02 22:53:44 +02:00 |
|
Vincent-Michael
|
ab85a9507e
|
Core/SAI: Added SMART_ACTION_CALL_KILLEDMONSTER log for has already spell kill credit
|
2013-09-02 17:48:55 +02:00 |
|
Vincent-Michael
|
97fc632b9d
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Server/WorldSession.cpp
|
2013-09-01 23:48:40 +02:00 |
|
Vincent-Michael
|
37bdc7a62b
|
DB/SAI: Fix quest credit for quest "Laying Waste to the Unwanted"
|
2013-09-01 23:34:07 +02:00 |
|
Vincent-Michael
|
a43e97f02d
|
SQL: Fix fail in 7facda2002
|
2013-09-01 21:45:22 +02:00 |
|
Vincent-Michael
|
591b90f3ce
|
DB/SAI: Fix quest credit for quest "Torching Sunfury Hold"
|
2013-09-01 19:57:55 +02:00 |
|
Vincent-Michael
|
8897f805a0
|
DB/SAI: Fix quest credit for quest "Building a Perimeter"
Note: Quest need event script
|
2013-09-01 19:48:13 +02:00 |
|
Vincent-Michael
|
ff8eab2d9f
|
DB/SAI: Fix quest credit for quest "Burn in Effigy"
Note: Quest need event script
|
2013-09-01 19:41:16 +02:00 |
|
Vincent-Michael
|
27bc3b1751
|
Core/Creatures: Added error log for SPELL_AURA_CONTROL_VEHICLE auras in creature_addon / creature_template_addon
|
2013-09-01 02:21:04 +02:00 |
|
Vincent-Michael
|
6c8d0e5405
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-08-31 21:52:15 +02:00 |
|
Vincent-Michael
|
22b71244a0
|
DB/Creature: Fix cords for quest "Death Comes From On High"
|
2013-08-31 19:33:14 +02:00 |
|
Vincent-Michael
|
e753a47162
|
DB/Sai: Fix quest credit for quest "Blessing of Incineratus"
|
2013-08-31 18:29:51 +02:00 |
|
Vincent-Michael
|
842b807757
|
DB/Creature: Add missing sql in 8fd1f46192
|
2013-08-31 17:54:07 +02:00 |
|
Vincent-Michael
|
8fd1f46192
|
Scripted: Fix warning
|
2013-08-31 17:52:47 +02:00 |
|
Vincent-Michael
|
b1721a65ee
|
Core/Spells: Fix quest credit for quest "Death Comes From On High"
|
2013-08-31 17:42:04 +02:00 |
|
Vincent-Michael
|
1501e95876
|
SQL: Fix typo in 44a317b71f
|
2013-08-31 00:03:35 +02:00 |
|
Vincent-Michael
|
44a317b71f
|
DB/Reputation: Move quest_repeatable_rate after quest_monthly_rate
|
2013-08-30 23:58:52 +02:00 |
|
Vincent-Michael
|
38bb6fe8e7
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
|
2013-08-30 23:46:24 +02:00 |
|
Vincent-Michael
|
3f6296b65e
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore
|
2013-08-30 23:09:01 +02:00 |
|
Vincent-Michael
|
081ee8f5d8
|
SQL: Fix typo
|
2013-08-30 22:14:24 +02:00 |
|
Vincent-Michael
|
224c5c5d3d
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/World/World.h
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/server/worldserver/worldserver.conf.dist
|
2013-08-30 21:43:02 +02:00 |
|
Vincent-Michael
|
87e105c818
|
Core: Fix warning
|
2013-08-30 20:56:41 +02:00 |
|
Vincent-Michael
|
aa0b910122
|
Core/Quest: Fix typo in 738a781468
|
2013-08-29 21:28:32 +02:00 |
|
Vincent-Michael
|
738a781468
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
|
2013-08-29 20:55:20 +02:00 |
|
Vincent-Michael
|
3166638078
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
|
2013-08-28 19:24:01 +02:00 |
|
Vincent-Michael
|
a917461762
|
DB/Misc: Fix startup errors
|
2013-08-28 19:06:20 +02:00 |
|
Vincent-Michael
|
174efdf05f
|
DB/Creature: Fix startup errors
|
2013-08-25 02:15:08 +02:00 |
|
Vincent-Michael
|
9461868710
|
Core: Fix non pch build
|
2013-08-23 20:09:39 +02:00 |
|
Vincent-Michael
|
dc86e87f25
|
Scripted/ShadeOfAkama: Some cleanups
|
2013-08-21 19:58:12 +02:00 |
|
Vincent-Michael
|
1e89ae1960
|
Core: Fix warnings and random changes
|
2013-08-21 18:46:52 +02:00 |
|
Vincent-Michael
|
34cd8e808e
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
|
2013-08-20 17:48:18 +02:00 |
|
Vincent-Michael
|
9727cc49ef
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-08-19 15:05:11 +02:00 |
|
Vincent-Michael
|
7679145da5
|
Core: Fix warning
|
2013-08-19 15:04:45 +02:00 |
|
Vincent-Michael
|
ff3ff68704
|
Update rename for openssl changes
|
2013-08-18 20:11:24 +02:00 |
|
Vincent-Michael
|
f16f427c48
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
src/server/scripts/Spells/spell_hunter.cpp
|
2013-08-18 18:13:14 +02:00 |
|
Vincent-Michael
|
9eb01d63bd
|
Core: Fix warnings
|
2013-08-18 13:54:20 +02:00 |
|
Vincent-Michael
|
7dbf68cbfc
|
Scripted/Misc: Remove some whitespace
|
2013-08-18 02:07:13 +02:00 |
|
Vincent-Michael
|
c32dbd1432
|
Core/Spells: Fix hunter T7 4P Bonus
Closes #8320
|
2013-08-18 00:55:44 +02:00 |
|
Vincent-Michael
|
da1e466bd5
|
Core/Misc: Implemented GetObjectScale function
|
2013-08-17 23:47:43 +02:00 |
|
Vincent-Michael
|
74689b1d93
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-08-16 18:35:54 +02:00 |
|
Vincent-Michael
|
443940c084
|
DB/Spells: Fix shaman talent "Tidal Waves" drop charges with effect 1
|
2013-08-15 22:41:53 +02:00 |
|