Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
29,917 Commits 2 Branches 1 Tag
b2ae2653f73fed2b1015d615cd6acb13064da170
Commit Graph
29917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nay 5ee22a8006 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_misc.cpp
 2012-09-04 19:08:22 +01:00
Kandera 8afecc6572 Core/Gameobject: fix collision for gameobjects 2012-09-04 14:04:47 -04:00
e 1695f78c9f Fix codestyle per Vincent-Michael 2012-09-04 13:04:30 -04:00
e 1e2ee2d680 [Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug. 2012-09-04 13:00:08 -04:00
Vincent-Michael a4c115a494 Core: Fix build 2012-09-04 18:21:00 +02:00
Kandera 26af8ac65a Core/Gameobject: another attempt at fixing collision. chest gameobject initial collision provided by vincent-michael 2012-09-04 12:08:12 -04: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
Shocker a005d4a9e3 Core/Spells: Implement SPELL_AURA_MOD_VENDOR_ITEMS_PRICES 2012-09-04 17:52:10 +03:00
Shocker 9c954a0cc4 Core/Spells: Crowd control spells PvP duration has been decreased to 8 seconds (down from 10) 2012-09-04 17:15:37 +03: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 3b02ea37ee Corrections to 'Merge pull request #7635' 2012-09-04 01:23:41 +01:00
Nay 2a13eb3d0e Merge pull request #7635 from cyberbrest/pull23 
[Core/Currency] perfom saving all currencies to db and some cap fixes.
 2012-09-03 17:16:21 -07:00
Nay fa29f1bb27 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-04 01:04:31 +01: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
cyberbrest c969fd1f3a Core/Currency: codestyle and Doxygen documentation. 2012-09-04 00:22:00 +03: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
cyberbrest 6ab07e81bd Core/Misc: typo 2012-09-03 23:27:14 +03:00
Gacko 913645d5c7 Core: Blood furnace - Update method header to lastest rev 2012-09-03 22:25:26 +02:00
cyberbrest ac3de951fc DB/Misc: add character_currency to full db. 2012-09-03 23:19:18 +03:00
cyberbrest 41c5bb3e50 [Core/Misc] change full character db because of currency changes. 2012-09-03 23:07:09 +03:00
cyberbrest dcfaf07054 [Core/Currency] drop conquestPoints and totalHonorPoints columns with porting data to new table. 2012-09-03 22:55:28 +03:00
cyberbrest 0c40fb0fe9 [Core/Currency] save all currencies on special db table. 
+ fix initialization currencies.
 2012-09-03 22:55:13 +03:00
cyberbrest e9a3d38769 [Core/Currency] not allow add more then week limit. 2012-09-03 22:55:02 +03:00
cyberbrest 9025a86536 [Core/Currency] no needed delta calculations + fix crashes because of it. 2012-09-03 22:54:45 +03: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
Nay 25cc49b489 Core: Fix x64 compile and GCC compile 2012-09-03 18:16:04 +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
cyberbrest 83bb6d0207 Core/Stats mana generation: remove MP5 rule (http://www.wowwiki.com/Mana_regeneration) + add correct 
generation formula from wowwiki

Closes #7459
 2012-09-03 16:27:58 +01:00
Nay f76b961562 Merge pull request #7491 from NorthStrider/pull-1 
[4.3.4] Core/Players: updated health regeneration to cataclysm.
 2012-09-03 08:24:36 -07:00
Nay 874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
 2012-09-03 16:11:46 +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