josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,386 Commits 1 Branch 0 Tags
71a0cc1706298281028434123e1ac016c082e486
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent_Michael 9391d087fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
 2013-01-15 23:33:36 +01:00
Vincent_Michael ddd765359f SQL: Fix sql import problems 2013-01-15 23:22:18 +01:00
Vincent_Michael 4b8615e468 DB/Game Event: Add missing changes in 6428af8f16 2013-01-15 22:53:30 +01:00
Vincent_Michael 6428af8f16 DB/Game Event: Fix Hallow's End start time (thx gonzo1247) 2013-01-15 20:36:24 +01:00
Vincent_Michael 7cb9bf1c2c DB/Creature: Add Missing spawn for Lunk-tusk 2013-01-15 12:29:50 +01:00
Vincent_Michael 8c4f59c6f9 SQL: Fix sql import problem 2013-01-15 12:04:46 +01:00
Vincent_Michael 6f8aa6a782 Core/Spells: Reorder more scripts in some script files and some cosmetic stuff 2013-01-14 20:28:32 +01:00
Vincent_Michael 65cd79dc77 Core/Misc: Update headers to 2013 2013-01-14 17:42:06 +01:00
Vincent_Michael d72d3df706 SQL: Rename some SQLs for 4.3.4 branch in correct name 2013-01-14 14:42:54 +01:00
Vincent_Michael c9ec5b4ce8 DB/Game Event: Update some game events start time for 2013 2013-01-14 12:07:37 +01:00
Vincent_Michael b06c7e7785 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-13 23:41:45 +01:00
blub 673a85e183 Merge pull request #8928 from joschiwald/spellscripts_reorder3 
Misc: Reorder more scripts in some script files and some cosmetic stuff
 2013-01-12 18:19:55 -08:00
Vincent_Michael b08ea19aff Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-13 01:25:56 +01:00
Vincent_Michael abe4b656c8 Scripts/Mechanar: 
* cleanup for door system
* Convert mechano lord capacitus in c++
 2013-01-13 01:07:11 +01:00
Vincent_Michael 9e91bcfe40 SQL: Fix "No newline at end of file" in bf7f58365f 2013-01-12 19:38:48 +01:00
Vincent_Michael bf7f58365f Scripts/Misc: Some cleanups 2013-01-12 19:35:32 +01:00
Vincent_Michael a02fa868a8 Core: Fix build 2013-01-12 19:01:49 +01:00
Vincent_Michael 84cdd538bb Core/Commands: Fix sql warnings with pinfo at ban players 2013-01-12 18:52:51 +01:00
Vincent_Michael cc5e40e8ee Scripts/Scholomance: Fix warning 2013-01-12 13:54:14 +01:00
blub 41817bc259 Merge pull request #8917 from joschiwald/spellscripts_reorder2 
Misc: Reorder more scripts in some script files and some cosmetic stuff
 2013-01-11 17:50:48 -08:00
Vincent_Michael 7fbd6d33dd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-12 02:38:34 +01:00
Vincent_Michael 2fcd4c381c DB/Conditions: Convert shadowstep spell script in conditions 2013-01-11 23:37:54 +01:00
Vincent_Michael b13e5694b6 Core/Conditions: Implement CONDITION_UNIT_STATE = 21 2013-01-11 23:37:53 +01:00
Vincent_Michael 66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2013-01-11 19:10:10 +01:00
Vincent_Michael d6d2cb0490 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-11 14:58:57 +01:00
Vincent_Michael ecbcca8794 Core: Whitespace cleanup 2013-01-11 14:49:38 +01:00
Vincent_Michael 6cd962ee71 Core: Fix non pch build 2013-01-11 14:21:39 +01:00
Vincent_Michael e6c8cc91ca Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-10 14:52:34 +01:00
Vincent_Michael 1154c62b65 Core/Tools: Fix logic fail for mmaps generator (thx armano2) 2013-01-10 12:40:26 +01:00
Vincent_Michael 899ffde1f9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-09 21:15:41 +01:00
Vincent_Michael 7210ffe34d Core: Fix warnings 2013-01-09 21:14:12 +01:00
Vincent_Michael cbf9324f61 Core: Fix build 2013-01-09 21:01:39 +01:00
Vincent_Michael f9c193d27d DB/Spells: Add missing sql in 669e2ed20f 2013-01-09 17:29:27 +01:00
Vincent_Michael 9f9f797d5d Scripts/TOCR: Fix some faction champions crash 
Closes #8393
 2013-01-08 23:01:26 +01:00
Vincent_Michael db330750b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-01-08 16:32:54 +01:00
Vincent_Michael d36d2eac76 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-08 16:28:37 +01:00
Vincent_Michael 20ab789fe7 Core: Fix build with Debian 7.0 
Closes #8882
 2013-01-08 16:26:45 +01:00
Vincent_Michael 8c58184535 Core: Fix non pch build 2013-01-07 23:40:20 +01:00
Vincent_Michael 8f36383d39 Core: Fix build 2013-01-07 23:28:03 +01:00
Vincent_Michael 05e03e7634 SQL: Rename SQL merged in PR 2013-01-07 23:09:34 +01:00
blub be5d3e5fd8 Merge pull request #8755 from krofna/crofixes 
Script/AQ: Implement Buru the Gorger
 2013-01-07 14:04:53 -08:00
blub 669e2ed20f Merge pull request #8725 from krofna/krefixes 
Script/AQ: Rewrite Skeram
 2013-01-07 14:03:28 -08:00
Vincent_Michael b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-01-07 16:57:39 +01:00
blub 9ad1857e59 Merge pull request #8826 from joschiwald/mmaps_disable 
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
 2013-01-07 07:52:35 -08:00
Vincent_Michael ecedb798aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Conditions/ConditionMgr.h
 2013-01-07 16:39:01 +01:00
Vincent_Michael ff3928ca6d Core: Fix warnings 2013-01-05 20:30:57 +01:00
Vincent_Michael d5163d846f 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/Achievements/AchievementMgr.cpp
 2013-01-05 17:01:46 +01:00
Vincent_Michael 24e0eb1812 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-01-05 16:55:17 +01:00
Vincent_Michael 7dd0cd4403 Core: Fix non pch build 2013-01-05 16:33:28 +01:00
Vincent_Michael ff48ea8a52 DB/SAI: Fix crash with quest "Thirst Unending" 
Closes #8856
 2013-01-04 21:02:05 +01:00
Vincent_Michael 8db66bfefd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-04 01:27:51 +01:00
Vincent_Michael 0f71fd8e23 Core: Fix build 2013-01-03 23:48:50 +01:00
Vincent_Michael 00ca57e2cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_reload.cpp
 2013-01-03 23:41:36 +01:00
Vincent_Michael a28d2d22f3 Core: Fix non pch build 2013-01-03 23:40:12 +01:00
Vincent_Michael f6ee4e3769 Core: Fix build 2013-01-03 18:15:23 +01:00
Vincent_Michael 6889f7cde6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
 2013-01-03 18:07:53 +01:00
Vincent_Michael fe6dc5c3cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-03 18:05:45 +01:00
Vincent_Michael 6a29a957dd Core/Spells: Rename SPELL_EFFECT_PLAYER_NOTIFICATION to SPELL_EFFECT_PLAY_SOUND 2013-01-03 18:00:26 +01:00
Vincent_Michael eba9abd2ee Core/Spells: Update no fly zone for wintergrasp 2013-01-03 17:37:39 +01:00
Vincent_Michael aa43ecd18d Core/Spells: Removed no fly zone for dalaran 2013-01-03 16:58:38 +01:00
Vincent_Michael 43f1c08e96 DB/Ulduar: Fix Kologarn Stone Grip in 25m mode 2013-01-03 02:54:46 +01:00
Vincent_Michael ee2e776fea Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 22:03:35 +01:00
Vincent_Michael 57c275f3e1 Core: Fix warning 2013-01-02 21:42:50 +01:00
Vincent_Michael 5bbf7829b2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 17:42:22 +01:00
Vincent_Michael cc99c739c6 Core/MT: Fix model for "Pure Energy" 
Closes #8838
 2013-01-02 16:58:23 +01:00
Vincent_Michael b873156c3c Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.h
 2013-01-02 14:12:48 +01:00
Vincent_Michael 05efdaf393 Core: Fix non pch build 2013-01-02 13:58:36 +01:00
Vincent_Michael 52fd561f47 DB/Creature: Removed "Grand Apothecary Putress" from Shattrath City 
Patch 3.0.3 (2008-11-04): Removed from Shattrath City.
 2013-01-02 05:15:53 +01:00
Vincent_Michael 336752a409 Core: Add missing changes in f7e7f5fe26 2013-01-02 03:25:08 +01:00