josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,797 Commits 1 Branch 0 Tags
11764233c56ed612a043ff2240c6d8fa738d01f3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent_Michael 866d82a2ce Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-10 22:20:33 +01:00
Vincent_Michael a9b740ab74 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/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-03-10 01:08:55 +01:00
Vincent_Michael 4ee0a4a446 Revert "Core/Commands: Optimize for command .npc near" 
This reverts commit 4e789d4c5c.
 2013-03-09 23:28:32 +01:00
Vincent_Michael 4e789d4c5c Core/Commands: Optimize for command .npc near 2013-03-09 23:05:27 +01:00
Vincent_Michael 65b16a97be Core/Commands: Add unit flags 2 for .npc info 2013-03-09 22:34:46 +01:00
Vincent_Michael ce0add2121 Core/Commands: Add mmaps check for command .gps 2013-03-09 22:19:14 +01:00
Vincent_Michael 56daf736e4 Core/Spells: Fix logic in 20eeeaf597 2013-03-09 21:33:28 +01:00
Vincent_Michael 20eeeaf597 Core: Fix warnings 2013-03-09 20:15:11 +01:00
Vincent_Michael d2024c5c05 Core: Fix build 2013-03-09 04:54:58 +01:00
Vincent_Michael 83c98d6dff Core/SmartAI: Implement SMART_ACTION_SUMMON_CREATURE_GROUP (107) 2013-03-09 02:03:37 +01:00
Vincent_Michael deabbb0e76 DB/Misc: Fix some db startup errors 2013-03-09 01:56:47 +01:00
Vincent_Michael 8aaaaedbdd Core: Fix warnings for msvc 2013-03-09 01:49:05 +01:00
Vincent_Michael 83a5043741 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2013-03-09 00:32:33 +01:00
Vincent_Michael b4542c6504 Core: Fix non pch build 2013-03-08 06:20:38 +01:00
Vincent_Michael a196ab60c3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-07 23:00:41 +01:00
Vincent_Michael 36495966c0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-06 18:00:30 +01:00
Vincent_Michael 4b4199d75b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2013-03-04 23:44:25 +01:00
Vincent_Michael 3c222d0ae3 Fix merge fail 2013-03-04 19:17:51 +01:00
Vincent_Michael 5d4e657e91 Core: Whitespace cleanup 2013-03-04 19:14:58 +01:00
Vincent_Michael 7ce02e7900 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2013-03-04 19:09:57 +01:00
Vincent_Michael c376757241 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-03 21:17:41 +01:00
Vincent_Michael 600e7e8cfb SQL: Fix typo 2013-03-03 13:53:52 +01:00
Vincent_Michael 85d96c5a3f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-03 00:44:29 +01:00
Vincent_Michael 5fd8add7bf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-01 21:45:00 +01:00
Vincent_Michael b2d05c9cdd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
 2013-02-28 22:14:48 +01:00
Vincent_Michael 6343a28030 Core: Whitespace cleanup 2013-02-28 18:29:43 +01:00
Vincent_Michael 9daf06f36a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Spells/Spell.cpp
 2013-02-27 21:12:00 +01:00
Vincent_Michael 052e47780e Core/ZulGurub: Move mondokir hardcoded spawn in db 2013-02-27 18:24:22 +01:00
Vincent_Michael cd24526aac Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-26 16:11:15 +01:00
Vincent_Michael 8d64a77bc0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-25 23:10:45 +01:00
Vincent_Michael 4bdc9e6f1c DB/Areatrigger: Update areatrigger_teleport cords for The Eye of Eternity entrance 2013-02-25 22:05:30 +01:00
Vincent_Michael 447b23c3bb Core: Whitespace cleanup 2013-02-25 19:54:41 +01:00
Vincent_Michael 529c4b7592 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MailHandler.cpp
 2013-02-25 17:11:36 +01:00
Vincent_Michael 1fba352a88 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-24 15:55:34 +01:00
Vincent_Michael d5eeeb11d3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-23 23:53:23 +01:00
Vincent_Michael 56e32aac82 SQL: Fix "No newline at end of file" in 194cc54f08 2013-02-23 18:15:49 +01:00
Vincent_Michael 194cc54f08 DB/Gameobject: Removed transport gameobject 2013-02-23 18:13:17 +01:00
Vincent_Michael 2672d13443 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-22 23:10:30 +01:00
Vincent_Michael 7d37629c17 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-21 17:10:33 +01:00
Vincent_Michael c0c2e533a9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
 2013-02-21 00:45:02 +01:00
Vincent_Michael 1df992e918 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-19 21:50:40 +01:00
Vincent_Michael 0c16890774 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/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.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/boss_kruul.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/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_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2013-02-19 18:57:36 +01:00
Vincent_Michael 71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Vincent_Michael 9004d39c09 Core: Whitespace cleanup 2013-02-18 00:56:25 +01:00
Vincent_Michael 6cfb5e13dc Core/Character: Rename engrish function 2013-02-16 18:53:44 +01:00
Vincent_Michael 166a2092fd Scripts/BWL: Fix build no. 2 2013-02-16 18:15:32 +01:00
Vincent_Michael 49e196e6b0 Misc/Spells: 
- Add some ulduar teleport pos for spells
- Add target hack for ulduar teleport spells
 2013-02-16 03:26:26 +01:00
Vincent_Michael 6beda05e3d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.h
 2013-02-15 14:23:21 +01:00
Vincent_Michael 3c5bf554ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-13 21:48:09 +01:00
Vincent_Michael d292b05ac1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-12 21:21:06 +01:00
Vincent_Michael 92573c4fb5 DB/Factionchange: Add a missing spell (Teleport: Darnassus / Teleport: Thunder Bluff) at player_factionchange_spells 2013-02-10 04:53:48 +01:00
Vincent_Michael caf70ee40d DB/Creature: Fix Onyxian Lair Guard equipment 2013-02-10 00:00:53 +01:00
Vincent_Michael 5b45a87da5 Core: More clean up whitespace 2013-02-07 00:24:00 +01:00
Vincent_Michael 943c866da9 Core: Whitespace cleanup 2013-02-07 00:02:22 +01:00
Vincent_Michael 1fbc25766f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-06 21:49:12 +01:00
Vincent_Michael 7f2a1ece62 Fix merge fail (fucking saving button -.-) 2013-02-04 22:17:23 +01:00
Vincent_Michael 12c8cdc26c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-02-04 22:14:56 +01:00
Vincent_Michael 66dfcd2b43 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
 2013-02-03 23:11:48 +01:00
Vincent_Michael 06041bc423 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
 2013-02-03 01:50:51 +01:00
Vincent_Michael 1cdfc65959 Script: Fix warning for craping script -.- 2013-02-03 01:32:14 +01:00
Vincent_Michael 0f53f69e52 Core: Fix build 2013-02-03 01:12:07 +01:00
Vincent_Michael 847cafc121 Scripts/Misc: Some code optimisations 2013-02-03 00:38:34 +01:00
Vincent_Michael 2c2fe7d464 Core/Misc: Small code optimisations 2013-02-02 19:06:47 +01:00
Vincent_Michael 9d7d68395c Core/SmartAI: Implement SMART_ACTION_SET_ROOT (103) 2013-02-02 18:18:27 +01:00
Vincent_Michael 6161f69b7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/SpellMgr.cpp
 2013-02-02 00:16:11 +01:00
Vincent_Michael b539a9717b DB/Gameobject: Removed gameobject with bad wdb data 2013-02-01 00:46:32 +01:00
Vincent_Michael 8350c088c7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-31 21:53:29 +01:00
Vincent_Michael 8e7806379d Core/Spells: Fix Gas Cloud Tracking stacking with other tracking spells 2013-01-31 19:59:44 +01:00
Vincent_Michael 9a0525757a Core: Fix some warnings 2013-01-31 00:35:33 +01:00
Vincent_Michael 71a0cc1706 Core/Spells: Add missing break in f5fd7bad69 
Thx Nayd
 2013-01-31 00:18:27 +01:00
Vincent_Michael f5fd7bad69 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
 2013-01-31 00:10:17 +01:00
Vincent_Michael 716c2db403 Core: Fix warnings 2013-01-30 19:09:09 +01:00
Vincent_Michael 5a74336c5e Core: Fix non pch build 2013-01-30 18:24:29 +01:00
Vincent_Michael 8814d8c136 Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup 2013-01-30 18:06:19 +01:00
Vincent_Michael ceed5ea42f Scripts/Icecrown Citadel: Fix warning 2013-01-26 19:57:11 +01:00
Vincent_Michael 480c847156 Core: Some cosmetic changes 2013-01-26 19:49:53 +01:00
Vincent_Michael 66e9b0c633 DB/Conditions: Add conditions for Bellowing Roar / Eruption 2013-01-26 19:22:47 +01:00
Vincent_Michael f4de181db0 SQL: Rename SQL merged in PR 2013-01-23 20:29:40 +01:00
blub a6f587a3b1 Merge pull request #9016 from joschiwald/spellscripts4 
Core/Spell: convert more spells to SpellScripts
 2013-01-23 11:19:39 -08:00
Vincent_Michael 98e01fdb3f Core: Fix build 2013-01-22 21:00:08 +01:00
Vincent_Michael 7a76de93f8 Update more copyright note for 2013. 2013-01-22 20:24:00 +01:00
Vincent_Michael db5d06afa9 DB/SAI: Fix more some db errors no.4 2013-01-22 20:16:56 +01:00
Vincent_Michael 017ff298dd DB/SAI: Fix more some db errors no.3 2013-01-21 22:53:22 +01:00
Vincent_Michael 367e1f7b2b Core: Fix warnings 2013-01-21 10:11:46 +01:00
Vincent_Michael 53c2340a53 DB/Misc: Fix db errors 2013-01-21 09:46:42 +01:00
Vincent_Michael 1e57543779 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
 2013-01-20 22:11:06 +01:00
Vincent_Michael 52d0e9f055 DB/SAI: Fix more some db errors no.2 2013-01-20 22:00:15 +01:00
Vincent_Michael bbcc78e2c1 Core: Fix warnings 2013-01-20 17:55:48 +01:00
Vincent_Michael b9f901a645 DB/SAI: Fix more some db errors 2013-01-20 17:34:15 +01:00
Vincent_Michael 96580a484e DB/SAI: Fix some db errors 2013-01-20 15:21:39 +01:00
Vincent_Michael 383e1a13f4 DB/SAI: Fix "Sludge Belcher" event spamming with aura 2013-01-20 01:19:37 +01:00
Vincent_Michael 94944e3072 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
 2013-01-20 00:34:20 +01:00
Vincent_Michael ed44eea699 Core: Fix warnings 2013-01-19 20:28:29 +01:00
Vincent_Michael 1be263e05b DB/Conditions: Add level restriction for "Drums of War" 2013-01-19 02:31:32 +01:00
Vincent_Michael c6ef4b1047 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-19 01:03:31 +01:00
Vincent_Michael 0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Vincent_Michael fbcb2e5335 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-17 23:49:26 +01:00
Vincent_Michael 11bda92b14 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-17 23:32:50 +01:00
Vincent_Michael 224b4480a7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-16 23:43:07 +01:00
Vincent_Michael 11bd11badc Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-15 23:34:50 +01:00