Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,654 Commits 4 Branches 146 Tags
91136ea55fe308db37d260969da60c488cf74b81
Commit Graph

18654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nay
7fe2d7309a DB/Schema: Rename and change types of a few fields in locales_creature_text and locales_npc_text 
locales_creature_text.textGroup -> locales_creature_text.groupid
locales_npc_text.entry -> locales_npc_text.ID
 2012-12-27 16:42:05 +00:00
Nay
29f3476947 Merge pull request #8791 from AliveShiro/icehowl 
Scripts/Trial of the Crusader: Fix Icehowl Script closes #8539
 2012-12-27 08:07:17 -08:00
Subv
3ee6ec258a Merge pull request #8795 from Naios/db_dbc 
[4.3.4] Core/DataStores: Upgraded spelldifficulty_dbc & achievement_dbc to 4.3.4
 2012-12-27 07:09:28 -08:00
Subv
1a8d7d738a Merge pull request #8787 from joschiwald/load_spell_procs 
Core/Spells: fix possible crash when loading `spell_proc` table
 2012-12-27 06:48:45 -08:00
Naios
978611d7dd Core/DataStores: Upgraded achievement_dbc db storage to 4.3.4 2012-12-27 15:42:55 +01:00
Naios
33ce380c12 Core/DataStores: Upgraded spelldifficulty_dbc db storage to 4.3.4 
* Update 2012_12_27_00_world_spelldifficulty_dbc_434.sql is required
 2012-12-27 15:42:42 +01:00
Nay
b530602b96 DB/Schema: Rename locales_quest.entry to locales_quest.Id for consistency with quest_template table 2012-12-27 14:29:05 +00:00
Gacko
9020084096 DB/Quest: Orgrim's Hammer questline - Thx @Exodius 2012-12-27 14:12:22 +01:00
Gacko
98be46dfd8 Rename sql file 2012-12-27 12:25:47 +01:00
AliveShiro
b19563fb6a Scripts/Trial of the Crusader: Fix Icehowl Script closes #8539 2012-12-27 12:12:27 +01:00
joschiwald
3288d7024a Core/Spells: fix possible crash when loading spell_proc table 2012-12-27 06:04:45 +01:00
Malcrom
aa92488ac6 DB/SAI: EAI to SAI Conversions 2012-12-27 01:15:34 -03:30
Malcrom
68ffe8a7a9 DB/SAI: EAI to SAI conversions. 2012-12-27 00:10:11 -03:30
Malcrom
18bc253f38 DB/SAI: EAI to SAI Conversions. 2012-12-26 23:16:05 -03:30
Malcrom
011acd0511 DB/SAI: EAI to SAI conversions. 2012-12-26 22:14:54 -03:30
Malcrom
24c4ea0801 DB/SAI: Fix SAI in previous commit. php is a powerful drug 2012-12-26 21:20:12 -03:30
Malcrom
56ccc61c03 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-12-26 21:13:44 -03:30
Vincent_Michael
e48bbac93f Core: Fix warning in 7b9b67a3b3 2012-12-27 01:42:25 +01:00
Malcrom
4a7e3937d3 DB/SAI: EAI to SAI conversions 2012-12-26 21:12:24 -03:30
Malcrom
cbd1b47507 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2012-12-26 20:13:19 -03:30
Malcrom
b47c2d7421 DB/SAI: fix error in sql 2012-12-26 20:11:19 -03:30
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
Malcrom
fd25bdd4b6 DB/SAI: More conversions from EAI to SAI 2012-12-26 20:01:55 -03:30
Vincent_Michael
ece2f7c7ab Add missing changes in 7b9b67a3b3 (fucking save button) 2012-12-26 23:23:49 +01:00
Vincent_Michael
7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00
Malcrom
24ac8f7a2a DB/SAI: Fix error in sql 2012-12-26 18:43:14 -03:30
Malcrom
914d3649c4 DB/SAI: EAI to SAI conversions with text 2012-12-26 18:26:55 -03:30
Warpten
b81166651a Core/Battlegrounds: Don't set a remaining time for arenas. 2012-12-26 22:21:06 +01:00
Malcrom
dba6bfe477 DB/SAI: Fix errors 2012-12-26 17:32:11 -03:30
Malcrom
c96326e4d9 DB/SAI: More conversions from EAI 2012-12-26 16:51:12 -03:30
Malcrom
995208eba2 DB/SAI/EAI: Update Spectral Servant to SAI and fix some EAI text errors. 2012-12-26 16:22:30 -03:30
Vincent_Michael
306c89468d DB/Game Event: Update Darkmoon Faire start times 2012-12-26 20:37:43 +01:00
Subv
81d53f8a87 Scripts/Ick&Krick: Krick should only say his KilledUnit text when the victim is a player. 2012-12-26 13:36:07 -05:00
Malcrom
32441d00f3 DB/SAI: Fix flags on previous commit 2012-12-26 14:52:41 -03:30
Malcrom
95d81d14f8 DB/SAI: Convert Defias EAI to SAI with text 2012-12-26 14:47:29 -03:30
Tuxity
88305adc63 Core/Spells: Fix eclipse system. Closes #8567 2012-12-26 19:03:11 +01:00
Malcrom
36b1ed213e DB/SAI: Convert Kobold's from EAI to SAI with text 2012-12-26 14:20:05 -03:30
Subv
05a7b3aaea Scripts/HoO: Implemented the weather effect while on Earthrager Ptah's sandstorm. 2012-12-26 12:48:10 -05:00
Tuxity
e873a22a37 Core: fix build and typo after 0622cf8b64 2012-12-26 18:30:37 +01:00
Malcrom
f499b52fd6 DB/SAI: Some convertions from EAI to SAI with text 2012-12-26 13:47:33 -03:30
huri
0622cf8b64 Scripts/Spells: Fixed Mage's Improved Flamestrike, Ice 
Shards, Shatter, Shattered Barrier, Incanter's Absorption,
 Improved Mana Gem, Improved Freeze
 2012-12-26 18:03:41 +01:00
Malcrom
49a067726d DB/SAI: Convert Zereketh The Unbound to SAI 2012-12-26 12:51:23 -03:30
Malcrom
da1f004145 DB/SAI: Convert Rhahk'Zor from EAI to SAI 2012-12-26 12:28:59 -03:30
Malcrom
30e2ab8e0f DB/SCRIPTS: Fix text for High Botanist Freywinn and remove creature_ai_texts. 2012-12-26 11:52:05 -03:30
MidnaAT
30936fd1c4 Core/Totem: Have Lightwell use Totem logic 
ref www.trinitycore.org/f/topic/7599-propper-lightwell-handling/
 2012-12-26 04:34:40 +01:00
kaelima
a8cd34c4a4 Core/Battleground: Rename and correct usage of opcode 1223 and increase the timer before arena/bg invitation window is removed to its proper value. Closes #6725 2012-12-26 04:02:42 +01:00
Kaelima
b566f544df Merge pull request #8771 from NorthStrider/Holy_Power 
[4.3.4] Core/Unit: Fixed Holy Power gain
 2012-12-25 18:58:39 -08:00
Subv
9a11b59ba8 Core/Vehicles: Fixed riding vehicles and mind control auras. 
Actually, fixed everything that allows you to control another unit.
 2012-12-25 21:50:39 -05:00
Northstrider
74bcb07adc Core/Unit: Set Holy Power ammount to 3. Holy Power can now be gained by using Crusader Strike. 2012-12-26 03:02:41 +01:00