Nay
36b3e06a7e
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-09-04 19:11:04 +01:00
Nay
73172c67f0
Misc: Convert from CRLF to LF in cs_misc.cpp
...
Also cleanedup whitespace
2012-09-04 16:14:15 +01:00
Kandera
a1e3758484
Core/Reputation: fix forced reputation auras with neutral. closes #5790
2012-09-04 11:11:15 -04:00
Kandera
6d57bf7a75
Core/Battleground: fix unneeded log message
2012-09-04 11:11:14 -04:00
kaelima
a3f9eee4e5
Core/Spells: Fix memory leak when Load() fails from spell/aura-scripts
2012-09-04 17:03:30 +02:00
Shauren
c4466facb1
Properly fixed one warning
2012-09-04 17:00:56 +02:00
Shauren
8ec0146721
Dep/G3D: Restored 99c8399772
2012-09-04 14:43:32 +02:00
Shauren
1e9fc84a12
Core: Warning fixes
...
C4100: 'x' : unreferenced formal parameter
C4310: cast truncates constant value
C4389: '==' : signed/unsigned mismatch
C4668: 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
C4701: potentially uninitialized local variable 'x' used
C4826: Conversion from 'HMODULE' to 'DWORD64' is sign-extended. This may cause unexpected runtime behavior.
C6067: Parameter '3' in call to 'sprintf' must be the address of the string
C6387: 'argument 1' might be '0': this does not adhere to the specification for the function 'CloseHandle'
2012-09-04 14:40:41 +02:00
Nay
b2bcc52fda
Revert "Core: Blood Furnace - Broggok event"
...
This reverts commit 153e88a16b .
2012-09-04 01:03:06 +01:00
Mik43l
a47ad2f5e1
Core/Auras: Added minimal delay before Rapture cooldown takes effect to allow all bubbles broken by a single damage source proc mana return
...
Closes #7443
Signed-off-by: Shauren <shauren.trinity@gmail.com >
2012-09-04 00:51:26 +02:00
kaelima
76be70a4dc
Core/Battlefield: Fix some memory leaks
2012-09-04 00:37:40 +02:00
Subv
c0b031af4d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2012-09-03 16:11:18 -05:00
Nay
b979e81dde
Merge pull request #7634 from Gacko/blood_furnace
...
Core: Blood Furnace - Broggok event and fix OnUnitDeath hook use
2012-09-03 13:30:27 -07:00
Gacko
913645d5c7
Core: Blood furnace - Update method header to lastest rev
2012-09-03 22:25:26 +02:00
kaelima
a9e672ab1d
Core/MMaps: Prevent path generation when falling or exiting vehicle
2012-09-03 20:34:07 +02:00
kaelima
d7eeebe0f3
Core/MMaps: Implement pathed charge effect
2012-09-03 20:30:47 +02:00
Gacko
153e88a16b
Core: Blood Furnace - Broggok event
...
Move prisoners back in cages after respawn. They didn't reset correctly
for players which were still in the instance after wipe
2012-09-03 20:09:45 +02:00
Nay
2fe8c2f41e
Dependencies/G3D: Fix build on x64 (change already included in TC's diff)
2012-09-03 18:24:35 +01:00
nelegalno
511beb8c19
DB/Quests: Fix required races for quest 9719
...
Closes #7604
2012-09-03 17:18:38 +01:00
Nay
6acb7f85f4
DB/GOs: Correct flags of GO 186371
...
Thanks Joshh
Closes #6846
2012-09-03 17:15:32 +01:00
Nay
c7fed98b9d
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
dep/PackageList.txt
2012-09-03 15:51:34 +01:00
Nay
0db5573d4d
Core/Dependencies: Update G3D to version 8.01
2012-09-03 15:39:07 +01:00
Nay
5f6e190a96
Core/Dependencies: Update zlib to version 1.2.7
2012-09-03 15:37:39 +01:00
Nay
531e16e5b8
Core/Dependencies: Update utf8-cpp to version 2.3.2
2012-09-03 15:36:36 +01:00
Nay
6cde35955d
Core/Dependencies: Update bzip2 to version 1.0.6
2012-09-03 15:35:28 +01:00
Nay
c8a91e2559
Tools/Extractors: Fix build under GCC 4.7
2012-09-03 15:21:52 +01:00
w1sht0l1v3
f46982ee7a
Scripts: Fix non pch build
2012-09-03 16:15:18 +03:00
w1sht0l1v3
128d99b29b
Core/Scripts: Rewrite Cold Hearted quest.
...
Closes #1758 .
2012-09-03 15:50:08 +03:00
Nay
80b61fa584
Core/Spells: Hard-limit the number of hit and miss targets sent in SMSG_SPELL_GO to 255 (each), fixes client crashes
...
Closes #3873
2012-09-03 02:45:27 +01:00
Nay
77c8e0a2a4
Merge pull request #7625 from Elron103/pull-requests
...
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
2012-09-02 17:05:34 -07:00
Elron103
1e361bc43a
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
2012-09-03 01:57:01 +02:00
Nay
1a49554af8
Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap)
2012-09-02 22:52:22 +01:00
click
0cca186a44
Core/Dependencies: Ugrade gsoap-library to v2.8.10
...
+ add documentation for later upgrades and the original stub.file used for service generation.
2012-09-02 22:57:10 +02:00
Vincent-Michael
28a5e1e148
SQL: Fix sql error (thx ChazyTheBest)
2012-09-02 21:02:35 +02:00
Nay
1731ff5ca1
SQL: Rename SQL file after PR
2012-09-02 15:50:29 +01:00
Nay
40c22de0b7
Merge pull request #7587 from acrathos/master
...
DB/SAI: Thorim and Lok'lira the Crone
2012-09-02 07:47:57 -07:00
nelegalno
f4fdb0c64c
DB/Quests: Fix required races for multiple quests
...
Closes #7620
2012-09-02 15:44:00 +01:00
Shauren
62b68f5a6c
Merge pull request #7613 from Elron103/pull-requests
...
Core/Scripting: Fix DoAction function of SummonList incorrectly removing entries in SummonList
2012-09-02 02:36:22 -07:00
Nay
ce003baea9
Merge pull request #7614 from Elron103/pull-requests2
...
Core/Scripting: Add missing entry in ScriptLoader for boss Ouro
2012-09-01 16:32:51 -07:00
Elron103
24d1a5a98e
Core/Scripting: Add missing entry in ScriptLoader for boss Ouro
2012-09-02 00:48:23 +02:00
Elron103
46852a3808
Core/Scripting: Fix DoAction function of SummonList incorrectly removing entries in SummonList
2012-09-02 00:19:13 +02:00
Nay
ffe8c75f17
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-01 22:20:33 +01:00
Spp
a7dd289b04
Core/Config: Change default log level of "Chat Log" to fit old log system
2012-09-01 22:13:12 +02:00
Spp
b127610510
Config: Cosmetic changes to fit config guidelines
2012-09-01 21:24:09 +02:00
Spp
7811e9100c
Core/Logging: Delete player filename will now use guid_name format like old log system. (was set to account_name by error)
2012-09-01 21:18:01 +02:00
Spp
5cafe0ca01
Core/Logging: Fix delete player crash having logging player enabled.
...
closes #7437
2012-09-01 21:15:20 +02:00
Myran2
4bc983d7b7
Core/Commands: Fix .cheat kill and add instakill immunity to it
...
Closes #7586
2012-09-01 00:36:26 +01:00
Nay
107bd5f5a3
Scripts: Fix non pch build
2012-09-01 00:11:44 +01:00
Nay
6b0c2a307b
Merge pull request #7599 from gacko28/zuluhed
...
Core/Spell: Unlocking zuluhed chains
Closes #996
Fixes quest Zuluhed the Whacked
2012-08-31 15:58:34 -07:00
Gacko
74d4aec49b
Core/Spell: Unlocking zuluhed chains
...
Core/Spell: Unlocking zuluheds chains
Core/Spell: Unlocking zuluheds chains
Core/Spell: Unlocking zuluheds chains
2012-09-01 00:35:52 +02:00