Commit Graph
2786 Commits
Author SHA1 Message Date
Spp 14027262ee Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load. 2012-10-29 13:58:48 +01:00
Spp d2ba73d97f Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions)
Core/Misc: tab to spaces and remove trailing whitespaces
2012-10-29 12:28:12 +01:00
Spp 876ad50dcd Core/Misc: Tweaked ThreatContainer internals
(and many cosmetic changes here and there)
2012-10-26 14:31:19 +02:00
Gacko ead804df92 Core: Fix compile warnings 2012-10-25 22:08:10 +02:00
Subv 55892048ef Merge pull request #8127 from Gacko/childrens_week
Core/DB: Children's Week
2012-10-25 07:43:02 -07:00
Gacko cd26aa7206 Core: Children's Week - Remove event.h include 2012-10-25 16:16:01 +02:00
Subv 69a81836ab Merge pull request #8174 from tibbi/sota
correcting SotA teleports + cleanup
2012-10-25 05:56:01 -07:00
tibbi f8ce00acca correcting SotA teleports + cleanup 2012-10-24 14:51:42 +01:00
Spp 013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +02:00
Spp 60d4343d8e Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Spells/Spell.cpp
	src/server/shared/Logging/Appender.h
2012-10-23 14:16:05 +02:00
Spp 663db1cee3 Core/Misc: Add default count param to HasItemCount 2012-10-23 13:11:57 +02:00
Kaelima 1ff5b83657 Merge pull request #8074 from Warpten/halionUpdate
Scripts/Ruby Sanctum: Misc fixes.
2012-10-23 03:58:48 -07:00
Spp 1be638e731 Core/Dungeon Finder: Add debugging commands 2012-10-23 11:44:02 +02:00
Warpten a664a356e2 Scripts/Ruby Sanctum:
* Fixed a crash caused by the grid.
* Update spawnmasks.
* Misc updates and corrections.

Closes #8079.
Closes #8078.
Closes #8081.
Closes #8077.
2012-10-22 21:18:21 +02:00
Subv 43d57c7547 Core/Build: Build fix from previous merge 2012-10-21 17:28:04 -05:00
Subv bcabdb08e4 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-10-21 17:26:37 -05:00
Subv 1fc3aad9d7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCfmt.h
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/scripts/Kalimdor/feralas.cpp
2012-10-21 17:18:35 -05:00
Subv 82c251dc3d Merge pull request #8088 from Gacko/q13038
Core/DB: Quest 'Distortions in time'
Closes #3011
2012-10-21 15:11:50 -07:00
Shocker 66889f11b7 Core/Spells: Use previous defines in a druid spell script 2012-10-21 22:25:52 +03:00
Gacko 9c4cf9b39c Core/DB: Children's Week 2012-10-21 14:33:20 +02:00
durotar 998c74ebe0 Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script 2012-10-20 11:44:43 -05:00
Gacko ae199b4839 Core/DB: Quest 'Gordunni Cobalt' - Codestyle 2012-10-20 15:53:11 +02:00
Gacko 0b7a842b61 Core/DB: Quest 'Gordunni Cobalt'
SpellScript and conditions for spells of this quest.
2012-10-20 15:01:04 +02:00
Ante b6c8c65567 Fixes phase 2 2012-10-20 13:36:21 +02:00
Subv 9dc2b7ecd5 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-10-19 17:57:30 -05:00
Subv 5362fc54f5 Merge pull request #8107 from durotar/master
Core/Script: Update creature_text for Gnomeregan
2012-10-19 15:34:45 -07:00
Subv 77a8d6f127 Scripts/Spells: Corrected the spirit value used in the Mana Tide Totem script. 2012-10-19 16:16:30 -05:00
Spp 67a03027ae Proper naming of LfgDungeon structures 2012-10-19 17:47:51 +02:00
Spp 2e55abcde4 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
2012-10-19 14:24:11 +02:00
Spp d0334bf948 Core/Dungeon Finder: Some optimizations.
- Store teleport coordinates to avoid recalculations each time someone has to be teleported
- Correct teleport error msg when player is charming or using vehicle
- Internal changes in storage types
- Proper code for missing achievement lock type
- Better debug msgs
- Trying to get rid of "Player*" and "Group*" inside LFGMgr as much as possible (Step 1)
2012-10-18 09:15:10 +02:00
Subv f8feb1ec0e Core/Scripts: Fixed build 2012-10-17 17:35:50 -05:00
Subv 2356e936a4 Scripts/Spells: Updated some Shaman SpellScripts to 4.3.4 2012-10-17 15:04:51 -05:00
Subv 705873091b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
2012-10-16 21:55:01 -05:00
durotar e56ef015ab Added some suggestions from Subv 2012-10-16 19:51:57 -05:00
durotar 290ddd64fe Core/Script: Update creature_text for gnomeregan 2012-10-16 19:30:33 -05:00
Spp 67118c6999 Fix compile under windows 2012-10-16 18:43:21 +02:00
Subv fba9c0a82e Scripts/Halion: Fixed some warnings 2012-10-16 09:39:56 -05:00
Gacko 1da4a8503c Core: Quest 'Distortion in time' - Codestyle
Replace enum name eCloseRift with CloseRift and add underscore to private
member counter.
2012-10-16 12:01:48 +02:00
Spp 14dab1f893 Fix compile without pch 2012-10-16 09:35:15 +02:00
Subv fc796fb879 Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift) 2012-10-15 18:01:16 -05:00
Subv fe55f735c1 Scripts/Spells: Updated some more spells to 4.3.4 2012-10-15 14:27:56 -05:00
Naios 61dce1a02e Core/PhaseMgr: Implemented Phase Definitions, Terrainswap and multiphasing
* fixes cataclysm aura effect SPELL_AURA_PHASE without phasemasks defined in miscValueA
* implements CONDITION_SOURCE_TYPE_PHASE_DEFINITION

Thanks to:
 - Cyberbrest: For the hard research work about multiphasing.
 - Venugh: He helped me with a lot of strange compile Errors.
 - Shauren: For the 4.3.4 phaseshift packet.
 - Booksize: He showed me how terrainswap works

Signed-off-by: Naios <naios-dev@live.de>
2012-10-15 20:31:41 +02:00
Subv c757f811f2 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Commands/cs_modify.cpp
2012-10-15 11:15:25 -05:00
Subv 963aa5a159 Scripts/Spells: Updated some warlock spellscripts to 4.3.4 2012-10-14 19:18:18 -05:00
Gacko 887509b1de Core/DB: Quest 'Distortions in time' 2012-10-14 19:18:41 +02:00
Gacko 59557091a6 Core/DB: Quest 'Distortions in time' 2012-10-14 17:24:59 +02:00
Nay e60aafcf35 Merge pull request #8065 from MrSmite/PetAI_Cleanup_1
PetAI Cleanup
2012-10-12 16:27:35 -07:00
MrSmite d28a62e579 Cleanup PetAI, remove unnecessary and broken JustDied(). Closes #7242
Thanks to Oiler2112 for suggestions and testing.
2012-10-12 16:48:33 -04:00
Warpten c8c4291c6f Core/Commands: Allow .modify money to take another parameter structure:
Example uses:
* .modify money 325g 25s 12c is the same as .modify money 3252512
* .modify money -12g is the same as .modify money -120000
* .modify money -12g 45s is the same as .modify money -115500
* .modify money 25c 18g is the same as .modify money 18g 25c
2012-10-12 22:13:28 +02:00
Nay abe81119b4 Core/Script: Fix item unusual compass.
By Kaelima and Retriman

Closes #8039
2012-10-12 01:28:37 +02:00