araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 22:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,977 Commits 17 Branches 140 Tags
d72d3df706ec11c787ebf1f61bc04cd2884f7b94
Commit Graph

5046 Commits

Author SHA1 Message Date
Vincent_Michael d72d3df706 SQL: Rename some SQLs for 4.3.4 branch in correct name 2013-01-14 14:42:54 +01:00
Spp d75222feca Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	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_venoxis.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/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-01-14 11:04:03 +01:00
Nay d4398eaafe TDB 335.50 - 2013/01/14 2013-01-13 18:53:32 +00:00
Nay bc0646e190 DB/Conditions: Fix DB startup errors 
Thanks @vlad852
Related to d77904e0af
 2013-01-13 18:18:26 +00:00
Gacko 0b07912622 Fix nonpch build and warning. Move script to spell_quest.cpp 2013-01-13 15:37:01 +01:00
Gacko 3a32c76de9 Core/DB: Gluttonous Lurkers 
Solves #1249
 2013-01-13 14:59:51 +01:00
Kirkhammett d77904e0af DB/SAI: Fix quest Parting Gifts 
Closes #8926
Closes #7804

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-13 13:55:17 +00:00
Gacko fdd853366a Core/Script: Uldaman - Altar of the Keepers 
... and some codestyle changes.
 2013-01-13 11:54:05 +01:00
Nay 03df612645 DB/Wps: Fix one last DB startup error related to waypoint_scripts 2013-01-13 03:02:36 +00:00
Vincent_Michael abe4b656c8 Scripts/Mechanar: 
* cleanup for door system
* Convert mechano lord capacitus in c++
 2013-01-13 01:07:11 +01:00
Malcrom 4fb60031f8 DB/Waypoints: Fix waypoints for Mechano-Lord Capacitus 2013-01-12 20:16:16 -03:30
Malcrom df2e54f587 Core/Scripting: More cleanup to Mechanar scripts. Added missing doors and handling to instance. 2013-01-12 19:35:14 -03:30
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
w1sht0l1v3 d8b2954507 Core/Tickets: Allow viewing of ticket response(if any) when using .ticket viewid or .ticket viewname. 
Fix an sql name.
 2013-01-12 14:26:30 +02:00
Gacko 1d6c6f55c7 DB/SAI: Hulking Abomination 2013-01-12 12:40:39 +01:00
Malcrom 0b6997b8af Core/Scripting: Move Boss_Gatewatcher_Gyrokill to c++ scripting. Additional cleanup in Mechanar. 2013-01-12 00:14:12 -03:30
Malcrom 1b15bd1df2 DB/Scripts: Fix a few SAI errors. 2013-01-11 20:49:00 -03:30
Malcrom df0c72d4de DB/SAI: Fix a couple errors. Closes #8839 2013-01-11 19:37:42 -03:30
Malcrom bdf8d2d5c3 DB/SAI: Some SAI for aq20. Closes #8866 2013-01-11 19:31:49 -03:30
Vincent_Michael 2fcd4c381c DB/Conditions: Convert shadowstep spell script in conditions 2013-01-11 23:37:54 +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
krofna dc30c63533 Script/AQ Implement Ayamiss the Hunter and fix screwup in my Ossirian 
Closes #8862

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-11 12:52:19 +00:00
Malcrom 0b50520df7 Core/scripting: Updating Scholomance scripts 2013-01-10 20:08:30 -03:30
Nay 9da1ff45b7 DB/Addon: Delete 1026 creature_addon rows and overwrite 98 creature_template_addon (phase 2.1) 
Conversion done with https://gist.github.com/4505135 (C#)
Thanks to Aokromes for the idea
 2013-01-10 19:42:24 +00:00
Nay 0ee5170552 DB/Addon: Delete 4012 redundant creature_addon rows (phase 2) 
Conversion done with https://gist.github.com/4504839 (C#)
Thanks to Aokromes for the idea
 2013-01-10 19:13:22 +00:00
Nay fd4767bcd0 DB/Addon: Convert 43637 creature_addon rows to 2429 creature_template_addon rows 
Conversion done with https://gist.github.com/4504302 (C#)
Thanks to Aokromes for the idea
 2013-01-10 18:11:29 +00:00
Nay fff86b7729 DB/SAI: Remove some redundant creature_texts using SMART_ACTION_CALL_FOR_HELP 2013-01-10 15:41:10 +00:00
Nay 8274e42e3d Core/SAI: Add 2nd parameter to SMART_ACTION_CALL_FOR_HELP to say "%s calls for help!" if enabled 
Similar to SMART_ACTION_FLEE_FOR_ASSIST "%s attempts to run away in fear!"
 2013-01-10 15:09:12 +00:00
Vincent_Michael f9c193d27d DB/Spells: Add missing sql in 669e2ed20f 2013-01-09 17:29:27 +01:00
ZxBiohazardZx d9339cea60 DB/SAI: Fix startup DB errors 2013-01-09 15:59:15 +00:00
Spp 25d35bacf9 Fix incorrect sql name 2013-01-09 16:39:57 +01:00
Spp 677ed18080 Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon 
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
 2013-01-09 15:15:42 +01:00
Pitcrawler ecfb762346 DB/SAI: You Reap What You Sow, closes #8827 2013-01-09 13:17:31 +01:00
Gacko e102629601 DB/Quest: Raise the Barricades 
Thanks to @Nevadas. Solves #8877
 2013-01-08 21:33:28 +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
Malcrom 2a9fc5198b Core/Scripting: Move Nightbane text to creature text 2013-01-07 22:44:09 -03:30
Malcrom 0226048686 Core/Scripting: Update Script for Postmaster Malown 2013-01-07 22:13:04 -03:30
ZxBiohazardZx c3134bc6cd DB/Creature: Remove ALOT of auras and creature_addon definitions, all these entries should be handled by SAI already, if not then SAI should be fixed 2013-01-08 00:45:44 +01:00
Malcrom 1c77eee917 Core/Scripting: Move Text for Shirrak the Dead Watcher to creature text 2013-01-07 19:50:31 -03:30
Malcrom 5ce88118ee Core/Scripting: Move Text for Timmy the Cruel to creature text 2013-01-07 19:27:35 -03:30
Vincent_Michael 8f36383d39 Core: Fix build 2013-01-07 23:28:03 +01:00
w1sht0l1v3 de3d507cc1 DB/SAI: Proper script for Snowfall Glade Pup SAI. 2013-01-08 00:24:24 +02: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
Malcrom 55d3e8adaa Core/Scripting: Move Text for Zul'jin to creature text 2013-01-07 18:14:30 -03:30
Malcrom 61fa397117 Core/Scripting: Move Text for Baron Rivendare to creature text. 2013-01-07 17:22:14 -03:30
Malcrom 3d1f61b278 Core/Scripting: Move Text for Ayamiss the Hunter to creature text 2013-01-07 16:29:20 -03:30
Malcrom 609232dfbe Core/Scripting: Move Text for Archavon the Stone Watcher to creature text 2013-01-07 16:12:49 -03:30