Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-01 22:56:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,215 Commits 4 Branches 146 Tags
b1eb4e58fdf38a045fbb734c4e7f45b660e556fc
Commit Graph

6393 Commits

Author SHA1 Message Date
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
DDuarte
a432bc7168 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-14 14:56:35 +01:00
Malcrom
716c2918d2 Scripting/Spell Stand: Move this spell to spells generic. 2014-09-14 11:15:25 -02:30
Vincent-Michael
3b0617ec45 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-13 23:29:43 +02:00
Vincent-Michael
5af2be7468 Scripts/Misc: Fix issues reported by static analysis 2014-09-13 23:15:00 +02:00
Vincent-Michael
0591ee53b5 Core/Misc: Fix merge fail 2014-09-13 22:59:28 +02:00
Vincent-Michael
ca3961f987 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
 2014-09-13 22:38:25 +02:00
MitchesD
d9fdbb06e4 Scripts/CoS: Salarmm rewritten to BossAI/EventMap 2014-09-13 21:39:26 +02:00
joschiwald
59baaeec48 Core/Chat: cleanup MonsterText methods 2014-09-13 20:41:31 +02:00
Vincent-Michael
11bb300c69 Script/CoS: Fix quest credit for mal ganis (but @Aokromes like more HACKS) 2014-09-13 19:14:32 +02:00
Nyeriah
e746e8685c Scripts/UtigardePinnacle: Use a generic spell to calculate the damage for Dark Slash instead 
Thanks to @Vincent_Michael for the heads up
 2014-09-13 11:10:33 -03:00
Nyeriah
12e405bedd Scripts/UtgardePinnacle: King Ymiron 
- Updated to EventMaps
- Replaced manual summons with proper spells
- Fixed glitch where boss would resume fight/run back to his main target before the ancestor summon roleplay was over (it might still need few adjustments i.e fire on boat is currently missing)
- Implemented damage calculation for spell Dark Slash (http://www.wowhead.com/spell=48292) as previously the spell would do no damage and it's BasePoints is 0
 2014-09-13 10:33:51 -03:00
DDuarte
b9b2a87d42 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-13 13:55:17 +01:00
DDuarte
27479cf571 Core/Scripts: Nuke db_script_string table and make SCRIPT_COMMAND_TALK with broadcast_text instead 
Original code by @Ascathor with modifications
Closes #13092
 2014-09-13 02:45:51 +01:00
Shauren
ce67a097bf Core/Entities: Use new PackedGuid class 2014-09-13 01:12:16 +02:00
jackpoz
f5a3913d95 Core/Misc: Refactor scripts to fix static analysis warnings 
Fifth batch of fixes targeting 100 issues reported by Coverity
 2014-09-13 00:01:34 +02:00
Shauren
7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp
 2014-09-12 20:26:46 +02:00
Malcrom
be8111b0a2 Scripting: Felwood: A little cleanup to my previous commit 2014-09-12 12:40:58 -02:30
Malcrom
6686c952b5 Scripting/Felwood: And some quest spells for quest 27989 & 27995 2014-09-12 12:13:38 -02:30
MitchesD
d7b0ee7c03 Merge pull request #12927 from MitchesD/misc_3 
Scripts/CoS: implemented Infinite Corruptor, improvements in instance sc...
 2014-09-12 15:25:07 +02:00
Dr-J
4e25304a66 Remove mount vendor cpp script 2014-09-12 13:48:51 +01:00
MitchesD
cc00d2f181 Scripts/CoS: implemented Infinite Corruptor, improvements in instance script and Meathook converted to BossAI 
Guardian of Time should have some text, but I have not found anything in sniff. Also the whole event needs to be rewritten and improved.
 2014-09-12 14:46:41 +02:00
Vincent-Michael
dd687592ca Core: Fix typo in cec2cc806b 2014-09-11 21:54:10 +02:00
Dr-J
cec2cc806b a correction 2014-09-11 20:50:37 +01:00
Dr-J
4331c714d7 Remove a Gossip Script which is already in DB 
Remove script for Khadgar all of the gossip menus and options are already in db and this is only a gossip script, will deal with db stuff in next commit
 2014-09-11 20:46:00 +01:00
MitchesD
1e3aa97098 Scripts/Misc: some small changes after recent commits 2014-09-11 15:22:30 +02:00
Nyeriah
b35edcabb6 Scripts/AV: Drekthar updated to EventMaps 2014-09-11 03:25:15 -03:00
Nyeriah
ce97e9194c Scripts/Gundrak: Eck the Ferocious updated to EventMap/BossAI 
- Moved his spawn handling to instance script
 2014-09-11 02:39:57 -03:00
Nyeriah
561cc47a00 Scripts/AV: Captain Galvangar updated to EventMaps 2014-09-10 03:45:44 -03:00
dkmbasura
08b2cf6cba Scripts/The Barrens: Make BIG WILL attackable in quest id 1719 (the affray) 
Closes #13072
Ref #4764
 2014-09-09 22:57:57 +01:00
Dr-J
29951ba394 Remove CPP script for Jenny/Jezzix Geartwist 2014-09-09 21:38:05 +01:00
Dr-J
02a1c92ea7 Remove seaforium depth charge 
Remove cpp script for seaforium depth charge ((Bury those cockroaches)).
 2014-09-09 20:35:23 +01:00
Vincent-Michael
48297860f1 Merge commit 'a2ba49afa428ed9297f98bf8a5e00f6f7a6f4c3a' into 4.3.4 2014-09-09 19:22:41 +02:00
Nyeriah
8907904757 Scripts/Onyxia Lair: Slight change so we don't call Reset() in the 'ctor 2014-09-08 18:02:06 -03:00
Vincent-Michael
8b41754854 Core: Fix build 2014-09-08 22:20:24 +02:00
Vincent-Michael
5cdea8b30c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-08 22:15:42 +02:00
Nyeriah
e181af1b1c Scripts/Onyxia Lair: Some small improvements to GUID storage as it's only used locally 2014-09-08 17:10:46 -03:00
Odyssey
54e201b8b9 Scripts/Commands: Allow to set a custom duration to the Freeze command applied Aura 
- Allow to set a default duration for the Freeze Aura in worldserver.conf
- Handle the .freeze and .unfreeze command custom effects through the Freeze AuraScript
- Make players able to eventually unfreeze by themselves since the aura will expire without someone having to use .unfreeze
- Make .freeze command usable with the following syntax:

      * .freeze (with a targeted player)
      * .freeze duration_in_seconds (with a targeted player)
      * .freeze playername duration (if duration is an invalid value it will be defaulted to the config one)
      * .freeze playername (in this case, duration will be defaulted to the config value)

- Make .listfreeze command able to show the remaining freeze duration on all affected players

Closes #12972
 2014-09-08 15:56:32 +01:00
joschiwald
3930606032 Core/Scripts: made BossAI::CheckInRoom virtual 2014-09-08 05:02:03 +02:00
Vincent-Michael
f2655b2d2d Core: Remove whitespace (again, again, ...) 2014-09-07 22:22:16 +02:00
joschiwald
cfc0c50b5e Core/Misc: dropped obsolete GameObject::GetGameObject method 2014-09-07 21:03:25 +02:00
DDuarte
6885eb4f2c Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-07 19:36:33 +01:00
jackpoz
df7f188cfe Core/Misc: Refactor scripts to fix static analysis warnings 
Fourth batch of fixes targeting 100 issues reported by Coverity
 2014-09-07 20:12:54 +02:00
Nyeriah
62cfca23ce Core/Misc: Meh some white lines, an addition to last sql's comment and a spotted typo 2014-09-07 14:29:04 -03:00
Nyeriah
93a01b6d50 Scripts/AV: Balinda Stonehearth 
- Updated to EventMaps
- Removed manual spawning of Water Elemental by using proper spell
* The Water Elemental has a duration, it'll despawn once it's over. She'll resummon it during the encounter if it dies or disappears.
* Fixes it's level scalling with owner.
- Moved Water Elemental AI to database.
- Script update
** Patch 3.1.0 (14-Apr-2009): Now casts Ice Block.
 2014-09-07 14:20:26 -03:00
MitchesD
17be840d4d Scripts/ScarletMonastery: fix typo caused by copy-paste 2014-09-07 18:47:25 +02:00
MitchesD
46930876e2 Scripts/ScarletMonastery: Interrogator Vishas updated to BossAI and EventMap 2014-09-07 18:43:58 +02:00
Nyeriah
2dc45fafe6 Scripts/Stratholme: Move Freed Soul AI to database and a small addition 
- They should follow players until they despawn
 2014-09-07 01:08:42 -03:00
Dr-J
9e816c8701 Remove CPP script for Ethereal Teleport Pad 
Remove CPP script which was not using proper mechanism for activating (ie gossip)
 2014-09-07 03:45:50 +01:00
Vincent-Michael
c7e1eae2ce Core: Remove again whitespace (meh :/) 2014-09-07 04:06:50 +02:00