Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,661 Commits 4 Branches 146 Tags
master
Commit Graph

7915 Commits

Author SHA1 Message Date
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
kaelima
a1c0d81fd6 Fix build 
Remove 2 unused header includes
 2012-10-11 08:34:00 +02:00
Subv
a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
 2012-10-10 10:29:18 -05:00
Subv
1f699f2cd3 Core/Scripts: Fixed the command to restore deleted characters. 2012-10-10 10:14:26 -05:00
Subv
ecc2362c69 Scripts/Commands: Fixed the command to restore a deleted character. 
Thanks @vlad852
 2012-10-10 09:25:25 -05:00
Subv
ef6e7e0914 Merge pull request #8001 from tibbi/reputation_convert 
correct reputation converting at faction change
 2012-10-10 06:43:47 -07:00
kaelima
2958f64ffc Scripts/Misc: Correct two wrong urand's 
(found by Aokromes)
 2012-10-09 14:53:29 +02:00
Nexflame
4fabb0ba32 Fix Compile 2012-10-08 22:52:13 +03:00
tibbi
5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Nay
44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
 2012-10-07 14:57:18 +01:00
Nay
972b418103 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-10-07 14:51:21 +01:00
Gigatotem
2b1a8004ba Spells/Hunter: Readiness 
Fixes Readiness resetting the cooldown of Gift of the Naaru. Needs testing
 2012-10-07 13:44:05 +02:00
w1sht0l1v3
26b998d94c Core/Scripts: Typo fix. 2012-10-07 14:28:39 +03:00
kaelima
8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
kaelima
bb08d429a3 Fix non-pch build 2012-10-07 00:53:37 +02:00
kaelima
5273949315 Fixed compile and renamed one sql files 2012-10-07 00:08:04 +02:00
Kaelima
6b56acaa28 Merge pull request #7913 from Warpten/theRubySanctum 
Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.
 2012-10-06 14:27:59 -07:00
Warpten
c971447855 Scripts/Ruby Sanctum: Halion, the Twilight Destroyer. 2012-10-06 22:47:52 +02:00
Nay
d641775a1f Core/Traps: Remove hardcoded cooldown value of 1 and use startDelay instead, as per Kaelima suggestion 
startDelay is 1 for all hunter traps

Fix non PCH build (boss_elder_madox.cpp)
Remove a double parentheses in LFGGroupScript
 2012-10-06 17:01:29 +01:00
Nay
d27a3955f0 Core/Misc: Tabs to spaces and whitespace cleanup 2012-10-06 16:55:01 +01:00
Nay
6497bea601 Merge pull request #7987 from CeIa/master 
Core/Script: Iron assemby encounter
 2012-10-06 08:46:45 -07:00
Nay
e369742dc7 SQL: Rename SQLs from 65c6b89d01 2012-10-06 16:44:35 +01:00