Commit Graph

440 Commits

Author SHA1 Message Date
Shauren
7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
2014-09-16 21:50:01 +02:00
Shauren
9b316fe689 Core/Scripts: Fixed PCH build 2014-09-16 00:44:56 +02:00
Shauren
5ac62d9ca3 Core/Scripts: Fixed build zone_* scripts 2014-09-15 23:57:03 +02:00
Shauren
48deb443f9 Core/Scripts: Fixed build of misc scripts, only zone_* and instance_* remain 2014-09-15 22:52:09 +02:00
Shauren
a3d8f1d879 Core/Scripts: Fixed build of boss_* scripts 2014-09-15 22:07:11 +02:00
Shauren
6ce0a3107d Core/Scripts: Changed GetGUID/SetGUID script hooks to operate on ObjectGuid class
Fixed compile for boss scripts starting with letters B, C and D
2014-09-15 00:23:47 +02:00
Shauren
56f46e3ce5 Scripts
* Introduced GetGuidData/SetGuidData to store guids in instance scripts (GetData64/SetData64 are still there)
* CONDITION_INSTANCE_INFO: Changed existing DATA64 condition to GUID_DATA to preserve current use of this instance info type (most/all assume the data is a guid) and moved DATA64 to a different value - no db changes needed
* Fixed compile in boss scripts starting with letter A
2014-09-14 23:23:23 +02:00
Nyeriah
92d514d0c9 Scripts/Misc: Some code style fixes for old code 2014-09-14 12:55:48 -03:00
joschiwald
59baaeec48 Core/Chat: cleanup MonsterText methods 2014-09-13 20:41:31 +02:00
Shauren
ce67a097bf Core/Entities: Use new PackedGuid class 2014-09-13 01:12:16 +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
Vincent-Michael
c7e1eae2ce Core: Remove again whitespace (meh :/) 2014-09-07 04:06:50 +02:00
Nyeriah
c585ce5b3c Core/Misc: Clear some outdated SD2 notes from recently modified scripts 2014-09-06 22:51:59 -03:00
joschiwald
ef9b4aea5e Core/InstanceScript: refactored load and save methods 2014-09-07 00:42:14 +02:00
Nyeriah
8b9726514f Scripts/Auchindoun: Updates Pandemonius to EventMaps/BossAI 2014-09-05 14:41:13 -03:00
Dr-J
2c24865b7a Remove CPP script for Oronok Torn-heart 2014-09-04 23:09:56 +01:00
MitchesD
680f90f37e Scripts/BF: The Maker rewritten to EventMap 2014-09-04 21:04:51 +02:00
Nyeriah
816c8c1c7a Scripts/Black Temple: Updates Najentus to BossAI and slight changes 2014-09-04 03:18:34 -03:00
Nyeriah
efccf18632 Scripts/Black Temple: Supremus to BossAI and slight changes 2014-09-04 02:11:52 -03:00
Nyeriah
d4049e62a3 Scripts/Blood Furnace: Update Broggok's script to EventMaps 2014-09-04 00:25:49 -03:00
Nyeriah
94ef426968 Core/Misc: Kill a white line from last commit and a small change to last sql 2014-09-03 05:04:02 -03:00
Nyeriah
fb63c8e915 Scripts/Black Temple: Update Mother Shahraz to EventMaps 2014-09-03 03:55:53 -03:00
Dr-J
0332b7dbe0 Remove CPP Script
Remove Greatmother Geyah's CPP Script
2014-09-01 03:22:19 +01:00
jackpoz
dd4dbdcd16 Core/Misc: Refactor scripts to fix static analysis warnings
First batch of fixes targeting 100 issues reported by Coverity
2014-08-31 20:42:02 +02:00
joschiwald
681cf8f27c Core/Scripts: rename files, remove whitespace and some other small changes after recent pull requests 2014-08-31 20:33:46 +02:00
joschiwald
251e283008 Merge pull request #12978 from Nyeriah/patch-auchi
Scripts/Auchindoun: Update Talon King Ikiss' script to EventMaps
2014-08-31 19:58:06 +02:00
Nyeriah
04cfcf523d Scripts/Auchindoun: Update Talon King Ikiss' script to EventMaps
Codestyle

Missing include
2014-08-30 18:43:50 -03:00
joschiwald
01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Duarte Duarte
10dfe19f9c Scripts/BladesEdge: Fix a typo introduced in 430b3ad
Thanks @Nihilianth
2014-08-26 15:10:58 +01:00
DDuarte
430b3adfe8 Scripts: Correct despawn time of multiple objects
WorldObject::SummonGameObject respawn time is in seconds and not milliseconds
2014-08-26 13:37:55 +01:00
joschiwald
bc42c48d97 DB/Spells: added a few spells to spelldifficulty_dbc 2014-08-26 04:35:37 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
MitchesD
d109fc0d7c Scripts/SteamVault: Hydromancer Thespia rewritten to BossAI 2014-08-22 16:34:18 +02:00
Dr-J
9f7075215d Remove Manaforges CPP Script
Remove script
2014-08-12 13:36:21 +01:00
jackpoz
8402570bb8 Scripts/Misc: Fix static analysis issues
Replace CAST_AI() macro with ENSURE_AI() when dynamic_cast is not supposed to return NULL.
2014-08-09 00:12:20 +02:00
jackpoz
3388587b7a Core/Misc: Replace rand() calls with SFMT 2014-07-22 21:43:19 +02:00
Shauren
7532864264 Buildsystem/MSVC: Warning fixes
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
2014-07-17 15:42:57 +02:00
Subv
dfdc19f3bc Merge branch master into boost
Conflicts:
               BattlegroundMgr.h
2014-07-13 16:52:38 -05:00
joschiwald
7b3141bfde Scripts/Gurtogg:
* fixed bloodboil targeting
* fel rage should only hit players

Closes #12193
2014-06-15 17:41:42 +02:00
Gacko
d2d1b97cff Script: Minor optimization in spell_unlocking_zuluheds_chains 2014-06-08 15:56:28 +02:00
Gacko
26370223a0 Script/Shadowmoon Valley: Remove hack in npc_shadowmoon_tuber_node.
This script will be converted to SAI (if possible) later.
2014-06-01 19:39:57 +02:00
Gacko
8ef34535a4 Scripts: Remove unused variables (kept as comment) 2014-06-01 19:34:34 +02:00
jackpoz
1083dbb993 Core/Misc: Remove Unit::Get* wrappers for ObjectAccessor::Get* 2014-05-20 21:21:33 +02:00
Shauren
f9c7bb4171 Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."
Visual studio does not support constexpr
Made semicolon after "Prepare*Script" mandatory - workaround for dumb IDEs inserting extra indentation level after newline
2014-05-18 12:50:10 +02:00
Praetonus
f296095191 Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.
-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.

Two minor changes in addition :

-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.
2014-05-15 21:32:47 +02:00
Dehravor
24ae6a6802 Core/Misc: Remove obsolete C++11 backward compatibility macros
OVERRIDE, FINAL, DELETE_MEMBER
2014-04-29 16:35:11 +02:00
jackpoz
2585e799f9 Core/Misc: Change how Position struct is retrieved
Update Position::GetPosition() and similar methods signatures to reflect 2a4c9bcaf9 changes by return a Position object instead of accepting a Position parameter by reference.
2014-04-25 21:19:30 +02:00