Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,516 Commits 4 Branches 146 Tags
62156f57b285ee252c2c4143236a3df95f219ca5
Commit Graph

7419 Commits

Author SHA1 Message Date
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
Nay
9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Spp
d35d33aa86 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/CMakeLists.txt
 2013-01-03 09:17:53 +01:00
Vincent_Michael
ee2e776fea Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 22:03:35 +01:00
Malcrom
dbfc4b83aa Core/Scripting: Some file name updates. 2013-01-02 15:08:13 -03:30
Malcrom
38c55a15ad Core/Scripting: Rename zone scripts. 2013-01-02 14:52:13 -03:30
Mislav Blažević
ab0d4624b8 Script/AQ: Implement Buru the Gorger 2013-01-02 18:51:41 +01:00
Malcrom
2fd10b5d15 Core/Scripting: Properly name boss_thorngrin_the_tender file. 2013-01-02 14:11:39 -03:30
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
Spp
6b668c8337 Core/Misc: Update headers to 2013 2013-01-02 13:31:19 +01:00
Spp
aed36a8375 Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ReferAFriendHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2013-01-02 13:30:51 +01:00
Spp
2292025bf9 Core/Misc: Replaced some macro definitions with inline functions 2013-01-02 09:07:52 +01:00
Trista
423fb04270 Script/EoE: Some fixes here and there 
* Add db support for Power Sparks, Teleports and Drakes
* Fix Power Sparks animations and texts and add support for giving buff to players + warning
* Fix Power Spark way of stacking - should be MultiSlot aura, didn't stack before either way
* Teleporters mechanic is fixed and will summon only 1 spark per 30-35 sec
* Fixed players getting mounted on 3rd phase
* Cleanned some wrong aggro handling, but whole aggro/attack system should be rewritten to get it working blizz
That is for today, this doesn't fix the whole instance by any means!
 2013-01-02 06:35:28 +02:00
Vincent_Michael
e0db317530 SQL: Fix sql import problem 2013-01-02 03:06:55 +01:00
Malcrom
1062a0b40f Core/Scripts: Added spell scripting for Commander Sarannis. Added Instance Template for The Botanica. 
Thanks to Vincent Michael
 2013-01-01 22:28:29 -03:30
Vincent_Michael
56096b7704 DB/Creatures: Some fix for Wyrmrest Skytalon 
Closes #8733
 2013-01-02 02:43:41 +01:00
Vincent_Michael
88e6071ff6 Core: Fix build 2013-01-02 02:28:00 +01:00
Malcrom
596ef0efd7 CORE/Scripting: Forgot new lines at end of file. 2013-01-01 21:41:37 -03:30
Malcrom
f7e7f5fe26 CORE/Scripting: Move Commander Sarannis & Thorngrin the Tender to cpp scripting. Add instance script. 
Thanks to Vincent Micheal for the help :)
 2013-01-01 21:36:21 -03:30
Vincent_Michael
62adbdab99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
 2013-01-01 23:12:21 +01:00
Shauren
312e8509dd Core/Spells: Implemented SPELL_EFFECT_RESURRECT_WITH_AURA (effect number 172) 2013-01-01 21:57:31 +01:00
Vincent_Michael
7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Vincent_Michael
eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael
11e1227784 Update more copyright note for 2013. (alcohol sucks) 2013-01-01 12:57:23 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Vincent_Michael
eac473df61 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-12-31 15:28:03 +01:00
Vincent_Michael
6317878b6f Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-31 15:26:57 +01:00
Gacko
edb90f957b Core/DB: Haaleshi Altar 
- Prevent crash due to spamming GossipHello
- Convert core script to SAI
- Solves #8220
 2012-12-31 15:03:19 +01:00
Vincent_Michael
8431be6bc6 SQL: rename sql for 4.3.4 
Core/ZulGurub: revert my logic fail in 4232658c62
 2012-12-31 14:15:24 +01:00
Vincent_Michael
4232658c62 Core:/ZulGurub: Fix mandokir decapitate targets 2012-12-31 12:58:16 +01:00
joschiwald
08f62d8313 Core/MMaps: use DisableMgr to disable pathfinding on a specific map 2012-12-30 21:09:21 +01:00
Vincent_Michael
ee9b7dfef8 Core/Command: Add command for near creature finding 2012-12-30 17:10:54 +01:00
Vincent_Michael
834f98f6bb Core/ZulGurub: Added script for Bloodlord Mandokir 
ToDo: Remove hack :P
 2012-12-30 03:02:39 +01:00
Vincent_Michael
9281eb42da Core: Fix build 2012-12-28 19:11:55 +01:00
Nay
3375f56bf8 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/thousand_needles.cpp
 2012-12-28 17:31:39 +00:00
Subv
ff5b0a14a4 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-12-28 11:45:46 -05:00
Nay
7ccef51c8c Merge pull request #8518 from ille/goreset 
scripts/gameobject: correct reset of gameobjects (cages/prisons), move command out of if statement
 2012-12-27 18:50:35 -08:00
secharles
8272affe92 Script/Commands: New command: lookup spell id #spellid 
Command to allow to know spell names based on id

Example:
 lookup spell id 686:
 686 - [Shadow Bolt rank 1 esES] [know]

Closes #8800

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-28 01:05:56 +00:00
Vincent_Michael
c93559c02d Core: Fix build 2012-12-27 19:50:16 +01:00
Nay
7e196e8e58 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-27 17:53:34 +00:00
Nay
91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp
 2012-12-27 17:52:11 +00:00
AliveShiro
b19563fb6a Scripts/Trial of the Crusader: Fix Icehowl Script closes #8539 2012-12-27 12:12:27 +01:00
Trista
452e585f7b Core/Vehicles: Fixed seat id for auras with SPELL_AURA_CONTROL_VEHICLE. Also always allow npc passengers to cast spells and remove TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE hacks. 
* Author: Horn. Please give feedback, I tested a lot stuff, but it will be appreciated.
* One of the fixes allow all creatures to cast when being passangers, researched, this doesn't involve players.
* This basically rewrittes vehicle seat formula calculated, so it fix quite stuff that will not be visible and some eye candies: #3831 and #1984 Heart part ;) (which magically fix a lot more of it and some quests), also Yog-Sarron mechanics
 2012-12-27 01:35:38 +02:00
Vincent_Michael
7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00