araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-20 06:59:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,250 Commits 17 Branches 140 Tags
b9b57c2d62fe68f5b35bf7cdb2fb6a68e501ca5e
Commit Graph

7452 Commits

Author SHA1 Message Date
Spp b9b57c2d62 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp
 2012-11-22 15:04:59 +01:00
Spp 32c259b1ce Core/Channels: Remove unnecessary calls to FindPlayer wherever is possible 
- Add better opcode debug messages
- Move isValidChatMessage debug messages to trace
 2012-11-22 12:11:35 +01:00
Tuxity 2f1000a9ed Core/Arenas: Drop old .modify arenapoint command, create a new command to add currency to players. 2012-11-22 01:39:54 +01:00
Tuxity 3d314acda8 Core/Spells: Fix Soulshards creation, remove old code of glyph of Drain Soul. Closes #8341 2012-11-22 01:20:02 +01:00
Spp d3c902915b Core/Dungeon Finder: Properly update Lfg Status (shouldn't lose 'eye' when changing maps or reconnect after disconnection) 
- Also fixes removing Player data when it shouldn't... should solve some problems with players not getting reward in some cases
 2012-11-21 19:56:48 +01:00
Kevin Darcel 2cf2df73de Merge pull request #8388 from horn/434_calendar 
Core/Calendar: Update calendar to 4.3.4 and enable calendar related opcodes
 2012-11-21 09:30:39 -08:00
Tuxity f5a54f8cbe Misc: Whitespace and tabs cleanup 2012-11-21 18:26:28 +01:00
cyberbrest f205bc9b4f Core/Currency: Add support of Conquest points cap for arena and bg 
Remove obselete code for arena points distribution

Thanks to @Zakamurite
 2012-11-21 18:25:23 +01:00
horn e5681fe904 Core/Calendar: Update calendar to 4.3.4 and enable calendar related opcodes 2012-11-21 18:01:55 +01:00
horn fa7bfbc8d0 Core/Calendar: Fix typos 2012-11-21 17:57:09 +01:00
Subv 31f6612baa Merge pull request #8384 from Amit86/toc_fix_typo 
Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE
 2012-11-21 05:18:59 -08:00
Spp 1d7adbfc7f Core/AI: Fix crash in SmartScript 
Closes 8340
 2012-11-21 12:36:00 +01:00
Amit 86 b0b3c9ffbe Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE 2012-11-21 09:31:53 +02:00
Subv 17071df235 Merge pull request #8383 from blipi/lfg_fixes 
Core/Dungeon Finder: Properly save old state for LfgPlayerData
 2012-11-20 19:35:45 -08:00
Blipi ae507e5cc6 Core/Dungeon Finder: Properly save old state for LfgPlayerData 2012-11-21 04:31:21 +01:00
Subv a17d44bcc2 Merge pull request #8381 from blipi/lfg_fixes 
Core/Dungeon Finder: Old state should be saved, not the new one
 2012-11-20 19:19:30 -08:00
Blipi 441712fbba Core/Dungeon Finder: Old state should be saved, not the new one 2012-11-21 04:11:58 +01:00
Vincent-Michael 84d88cbcec Core: Fix warnings 2012-11-21 00:43:24 +01:00
Vincent-Michael 695836cb01 Core: Fix non pch build 2012-11-21 00:15:58 +01:00
ZxBiohazardZx 8bd462b6d1 Core/scritps: change enum to fix compile 2012-11-20 23:20:14 +01:00
ZxBiohazardZx 074b2e3936 Merge pull request #8371 from Gacko/creaturetext 
Core/DB: Some script to creature text conversions...
 2012-11-20 13:53:55 -08:00
Gacko 1e5e7056dc Core/DB: Converted 7 more scripts to creature text 2012-11-20 22:03:10 +01:00
Spp cd2b79f8d4 Fix compile under windows 2012-11-20 20:45:10 +01:00
Spp 08b7439f48 Typo Fix after 81606e5 (Thanks to vlad852 for noticing) 2012-11-20 19:02:58 +01:00
Gacko 9dc06f8bd9 Core/DB: Some script to creature text conversions... 2012-11-20 18:08:18 +01:00
Spp 1ecc55272e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 2012-11-20 16:01:31 +01:00
Spp 7bef4ce401 Core/Misc: Reduce header dependencies - Step III 2012-11-20 15:03:56 +01:00
Shauren 70d44f97dc Core/ObjectMgr: Fixed crash on shutdown 
Closes #8362
 2012-11-20 12:48:00 +01:00
Spp b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Tuxity 172c5f0b93 Core/Arenas: Fix arena system, you can now enter in arenas and fight ! 
Countdown in preparation time are also displayed
EnnemyUnitFrame while fighting works too

N.B: There might be some little typos to fix.
 2012-11-20 10:37:25 +01:00
Spp 81606e5d1e Core/Misc: Define some methods const 2012-11-20 09:29:52 +01:00
MrSmite ced723a53a Core/Pets: Pet "at rest" distance from owner is now closer as it should be 
Original PR modified

Closes #8358
Closes #8181

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 23:55:42 +00:00
horn 4a86b83cb6 Core/Calendar: Minor change. 2012-11-19 22:28:53 +01:00
Vincent-Michael 7aa967e966 Scripts/AQ: Fix warnings (thx razhael) 2012-11-19 16:24:59 +01:00
Spp fff684ec78 Remove duplicate code after some old merge 2012-11-19 12:03:45 +01:00
Spp bf8b642a47 Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4) 2012-11-19 12:02:33 +01:00
Spp 7f061fc57f Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2012-11-19 10:09:58 +01:00
Subv d42212b595 Core/Battlegrounds: Add methods for determining the winner of a BG if it has ended due to not enough players. 
Implemented for Arathi Basin, Alterac Valley, Warsong Gulch and Eye Of The Storm.
All other BGs winner are currently decided based on the number of players of each side, they will be implemented later.
 2012-11-18 22:07:44 -05:00
Subv a337abc436 Scripts/Instances: Added missing definition from previous commit. 2012-11-18 20:53:27 -05:00
Subv bbe146d104 Scripts/Instances: Save Magister's Terrace door (and statue) state. 
Closes #6889
 2012-11-18 20:33:03 -05:00
Nay 27cf98dac1 Scripts/AQ: Fix non PCH build 2012-11-19 01:02:31 +00:00
Nay 4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00:00
tibbi 1f9db80b69 Scripts/ToC: Trial of the Crusader rewrite 
Closes #8272
Closes #7013
Closes #7552
Closes #5561
Closes #4221
Closes #2701
Closes #2079
Closes #5082
Closes #6503
Closes #6784

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 00:42:25 +00:00
krofna aea5fec30d Scripts/AQ: Implement Ossirian the Unscarred 
Fix yell on kurinaxx death

Warning fix

Closes #8254

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-19 00:37:43 +00:00
Gacko 45b07f0931 Scripts&DB: Nexus - Ormorok 
Following improvements:
- Spellscript for crystal spikes
- Spawn crystal tanglers with spell
- Usage of event map
- Correct usage of frenzy
- Heroic spells
- Target selection for crystal tanglers

Details for the spell script:
There are 4 spells. Each of them spawns the same trigger but in another direction. The trigger gets an aura which triggers the spell which summoned him after 250ms. This time is too long, so it triggers on apply. Don't worry - test ingame first, it's working blizzlike (I watched some videos on YT to find out which is the best amount of time difference between spawn and next summon).

Some summon types don't store the spell id which summoned them. The trigger is one of them which are not doing so. So I had to move the line, which stores the spell id in the summon out of the if. This could be done more specific, but it works fine. This improvement is required to find out which spell the aura applied to the summoned trigger has to cast to keep the right direction.

Closes #8193

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-18 23:46:03 +00:00
horn 771aafc499 Core/Calendar: Completely rewrite and fix most of the calendar system 
There are still some issues that need to be fixed, for more info see CalendarHandler.cpp TODO part.
Some unblizzlike behaviour possible, we don't have a lot of sniffs.
Big thanks to @Warpten, he joined my project and helped a lot.

IMPORTANT NOTE: Read / append packed time functions in ByteBuffer.h are not correct, they need to be fixed in order to have event times accurate

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-18 22:42:28 +00:00
Nay 47fcf4ce58 Merge pull request #8330 from MrSmite/PetAI_TargetSelect 
[Core/Pet] PetAI_TargetSelect
 2012-11-18 13:52:58 -08:00
Nay bb8e31d1bd Merge pull request #8259 from Warpten/supLion 
Scripts/Ruby Sanctum: Tweaks and stuff.
 2012-11-18 13:51:58 -08:00
Spp e60d26f36b Another crash fix after b99c347 2012-11-18 13:50:14 +01:00
MrSmite 0dfac02446 Fix PetAI missing aggressive pet target select 
PetAI minor cleanup of target selection
 2012-11-18 00:24:24 -05:00