Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
19,357 Commits 2 Branches 1 Tag
112c2a8dd0b1186fab878dcd2da8f666ae2fcdf8
Commit Graph
15782 Commits
Author SHA1 Message Date
Nay 112c2a8dd0 Core/Misc: Fix a merge failure in SpellAuraEffects.cpp 
Thanks Tuxity and Vincent
 2013-01-28 12:53:51 +00:00
Nay 98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge 
There are probably other merge issues that got through, please report them
 2013-01-28 02:54:27 +00:00
Nay b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2013-01-28 01:04:37 +00:00
Shauren 6e80357f8e Core/Authserver: Added possibility to allow realm connections both from "world" and local networks. 2013-01-27 17:33:01 +01:00
Shauren e1d12de2b1 Core/Battlegrounds: Fixed arena scoreboards not showing all players. 2013-01-27 11:56:56 +01:00
Nay 1b551cc157 Scripts/Commands: Add guild info to .pinfo 
Original patch by @secharles, modified

Closes #8946
 2013-01-26 21:33:13 +00:00
Vincent_Michael ceed5ea42f Scripts/Icecrown Citadel: Fix warning 2013-01-26 19:57:11 +01:00
Vincent_Michael 480c847156 Core: Some cosmetic changes 2013-01-26 19:49:53 +01:00
Nay 18f5de77c3 Core/GossipDef: Fix a build error from 9812afe08b 
*slaps MrSmite*
 2013-01-26 17:48:47 +00:00
Nay 9812afe08b Merge pull request #9063 from MrSmite/QuestLevelsInUi 
Option to show quest levels in dialogs
 2013-01-26 09:23:58 -08:00
w1sht0l1v3 f0800d3926 Scripts/ShadowmoonValley: Fixup script for Lord Illidan Stormrage quest to be doable. 
Notice: this whole script needs a proper rewrite(contains wrong Illidan npc id,bad dialogues,etc).
 2013-01-26 19:19:55 +02:00
Shauren a3d07b5e6a Core/Spells: Fixed Darkflight, Two Forms and Running Wild for worgens. 
Closes #8905
 2013-01-26 13:25:06 +01:00
MrSmite a45f7fd878 Adds CONF option to show quest levels in dialogs. 
Example: [13] Westfall Stew

Default = 0 (off). Make sure to set UI.ShowQuestLevelsInDialogs to 1 to turn it on

NOTES:

* DO NOT supply the quest level when using commands such as .lookup quest, it
is not actually part of the title (even though it will be printed in the result)

* Also adds the level in the quest tracker and quest log

* If locale is used, the level is added after the proper title is looked up

* LUA Mods that offer this feature do not work properly with TC, most will not put the level in all dialogs. Users who have such mods should disable the mod's feature or they may see the quest level listed twice.

Example: [13][13] Westfall Stew
 2013-01-25 21:47:07 -05:00
WishToDie 1348e4e44d Fix Typo. 2013-01-26 00:57:10 +02:00
w1sht0l1v3 6acfa49065 Script/Commands: Implement command to list the members of a group/party. 2013-01-26 00:41:46 +02:00
Machiavelli 61495d18a3 Core/Log: Fix crash due to uninitialized variable 2013-01-25 21:40:21 +01:00
thomas33 c36aa6e7af fix typo 2013-01-25 12:25:06 +01:00
Shauren 705d0c8865 Scripts/Icecrown Citadel: Fixed possible crash with Bone Spike Graveyard 
Closes #7171
 2013-01-24 22:51:42 +01:00
Shauren 1c7ade5e54 Scripts/Icecrown Citadel: Fixed Deathbringer Saurfang's Blood Power scaling on first attempt. 
Closes #3283
 2013-01-24 22:46:45 +01:00
Spp 0d3cc3ae3a Core/Log: Fix console colors (missing change from 53a3373) 
Closes #9051
 2013-01-24 21:52:29 +01:00
Nay a3c9e67731 Merge pull request #8953 from MrSmite/PetAI_PassiveCastFix 
Fix passive pets not using spells when commanded to attack
 2013-01-24 08:55:31 -08:00
Nay c757d24c5a Merge pull request #8978 from Naios/sai_timed_cond 
Core/SmartScripts: Check Conditions also for timed Events
 2013-01-24 08:50:51 -08:00
Shauren bf0c976f76 Core/Players: Fixed uninitialized variable for item swaps 2013-01-24 17:23:34 +01:00
Spp 53a3373a98 Core/Logging: Fix all possible crashes when using bad Appender config settings 2013-01-24 16:57:35 +01:00
Spp cc605e0605 Core/Misc: Minor cosmetic changes here and there 2013-01-24 16:57:35 +01:00
Shauren 08866f377e Tools/mmap_generator: Fixed a deadlock at exit 2013-01-24 16:40:35 +01:00
Nay 526bb51696 Merge pull request #9049 from springfieldking/master 
Fix crash when wordserver startup
 2013-01-24 06:45:51 -08:00
Nay 2542c307bc Merge pull request #9027 from Xanvial/TV 
[4.3.4] Scripts/Paladin: Templar's Verdict
 2013-01-24 06:42:41 -08:00
Nay 40a470c669 Merge pull request #9037 from krofna/crefixes 
Fix error when swapping unique equipped weapon on dual wield
 2013-01-24 06:39:50 -08:00
springfieldking 389a4899f4 Update src/server/shared/Logging/Log.cpp 
Fix crash when the last iter plus and change value
 2013-01-24 22:26:11 +08:00
Spp 23b6a6a7cd Core/Log: Rotate logs when maximum size is exceeded, backup name will be "filename".datetime 
- This is an addition to 39c2d89
 2013-01-24 12:44:58 +01:00
Mislav Blažević 3034db9296 Core/DBLayer: Fixed required version definitions 2013-01-24 11:05:36 +01:00
Mislav Blažević 54027803bd Fix error when swapping unique equipped weapon on dual wield 
Also fix rings and trinkets
 2013-01-24 08:59:14 +01:00
Shocker 6dc9b4cc44 Core/Guild: Fix guild bank money withdraw update 2013-01-24 07:20:19 +02:00
Shocker 2169c644b9 Core/Spells: Actually remove code for dispel effects check (ref bff076bd2a) 2013-01-24 06:24:03 +02:00
Nay b1cdb5bb68 Core/Chat: Fix parse handler for CMSG_MESSAGECHAT_ADDON_GUILD and CMSG_MESSAGECHAT_ADDON_BATTLEGROUND 2013-01-24 02:25:00 +00:00
Machiavelli fd967ba4c6 Tools/mmaps_generator: Multithreading optimisations. Should save some time generating mmaps. 2013-01-24 01:20:25 +01:00
Machiavelli 0f8a8a3270 Merge branch 'HEAD' of git@github.com:TrinityCore/TrinityCore.git 2013-01-24 01:13:21 +01:00
Shauren 5d75ac29b4 Tools: Remove a bit of spam when mmaps_generator loads vmaps 2013-01-23 23:25:42 +01:00
Shauren 6c5fbc492c Scripts/Icecrown Citadel: Fixed Essence of the Blood Queen interrupting player spell casts 
Closes #8665
 2013-01-23 23:14:18 +01:00
Machiavelli 1c0239ea98 Core/DBLayer: Drop support for MySQL versions <5.1 
Both server and client libraries must be up to date in order to run TC.
 2013-01-23 22:56:56 +01:00
Vincent_Michael f4de181db0 SQL: Rename SQL merged in PR 2013-01-23 20:29:40 +01:00
blub a6f587a3b1 Merge pull request #9016 from joschiwald/spellscripts4 
Core/Spell: convert more spells to SpellScripts
 2013-01-23 11:19:39 -08:00
WishToDie d291c78ca0 Typo fix. 2013-01-23 21:08:33 +02:00
w1sht0l1v3 70490c8238 Script/Commands: Add command to join an existing group/party. 2013-01-23 20:58:01 +02:00
Machiavelli 39c2d892f3 Core/Log: Allow configuring a maximum file size for a log file. If the file size is about to be exceeded, the core will create a new file titled <oldname>_.log and start outputting there. 2013-01-23 17:48:17 +01:00
Tuxity cb118cddc7 Core/Arenas: 
- You earn 180 cp when you win a match
- Correctly display cp to the good currency meta
- Rename a currency meta to avoid errors
 2013-01-23 09:19:49 +01:00
Nay 11c1eeceed Tools/vmap4_extractor: do not add gcc/clang compile flags when using MSVC and fix a little warning 2013-01-23 00:36:05 +00:00
joschiwald af50ce6223 Core/Spell: convert more spells to SpellScripts 2013-01-22 23:36:51 +01:00
Xanvial e360f87470 Scripts/Paladin: Templar's Verdict 2013-01-23 05:26:51 +07:00