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
17,567 Commits 4 Branches 146 Tags
917ffc030ea2ffaf698d2bd2b1e7967081a27beb
Commit Graph

1987 Commits

Author SHA1 Message Date
Warpten
917ffc030e Core/Guilds: Implemented GuildFinder. 2012-09-10 12:41:42 +02:00
Nay
d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
 2012-09-10 00:52:35 +01:00
Nay
5226f53b8a Core/Guilds: Corrections to guild news & rewards commit, fixed build and added missing sql 
Closes #7708
 2012-09-10 00:06:47 +01:00
Subv
6fc3d3a77c Core/Scripts: Some cleanup in warlock spellscripts 2012-09-09 12:28:31 -05:00
Subv
da5f8f58e2 Core/Scripts: Cleanup the warrior spell scripts 2012-09-09 11:48:29 -05:00
oMadMano
e377550280 Scripts/Karazhan: Fix Prince Malchezaar Infernal start timer 
Closes #5700
 2012-09-09 16:24:06 +02:00
Vincent-Michael
637894da1a Core/Spells: Fix typo (I need sleep) 2012-09-09 04:19:17 +02:00
Vincent-Michael
2317af8dd3 Core/Spells: Convert Gift of the Naaru in spell script 
Closes #6545
 2012-09-09 04:02:47 +02:00
Nay
7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-09 02:18:58 +01:00
Nay
d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Myran2
c243185a3a Removed a line of debug code 2012-09-08 19:01:33 -04:00
Myran2
5cd9910463 Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game 2012-09-08 18:59:06 -04:00
Subv
b8343391c2 Core/Scripts: Muglash should walk instead of running. 2012-09-08 07:51:54 -05:00
blub
16989dea6a Merge pull request #7690 from Geodar/master 
Core/Scripts: Fix typo
 2012-09-08 04:29:08 -07:00
Vincent-Michael
9c54cf3312 Core: Fix warnings 2012-09-08 13:24:42 +02:00
Geodar
2c441808f1 Core/Scripts: Fix Typo in 7121f015ed 2012-09-08 08:02:00 +02:00
Nay
242a2fdbc1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
 2012-09-08 01:34:24 +01:00
Subv
7121f015ed Core/Scripts: Fixed a copy/paste mistake from previous commit 2012-09-07 18:31:19 -05:00
Subv
673ce30f38 Core/Spells: Fixed Improved Health Funnel damage reduction effect. 
Author: Josh
closes #7275
 2012-09-07 18:26:14 -05:00
tibbi
286feb6940 Scripts/ToTC: Correcting Jaraxxus Volcano and Nether Portal behaviour 
Closes #7687
Closes #7467
 2012-09-07 18:01:02 +01:00
Nay
19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-07 03:36:47 +01:00
Nay
21d43781ac Tabs to spaces... 2012-09-07 03:33:16 +01:00
Subv
0709d67e08 Merge pull request #7678 from Aokromes/master 
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
 2012-09-06 19:08:29 -07:00
Aokromes
6970a28f24 Scripts/Scarlet Monastery: Final boss kill credit closes #7341 
When Scarlet Commander Mograine dies and High Inquisitor Whitemane appears, if she is downed very quickly, then she will not perform the ressurection on Mograine and will not stun anyone, thus Mograine wont give the achievement nor loot. She should be invincible till she has ressurected Mograine.
 2012-09-07 05:01:04 +03:00
kaelima
5eb22e5b64 Core/Vehicles: 
- Send proper triggering flag when casting spellclick spells on vehicles (should not be fully triggered)
- Only compute non-transport positions when not finalized. (Fixes changing seat on vehicles, or changing vehicle from vehicle)
 2012-09-07 03:17:04 +02:00
Vincent-Michael
6f38fb1011 Core: Fix some code style 2012-09-07 02:21:38 +02:00
Nay
15086e92f1 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-06 17:55:37 +01:00
Vincent-Michael
5954011a90 Core/Spells: clean up some code and move to spell script. Closes #7195 2012-09-06 11:00:37 -04:00
Nay
f44ddb3355 Tabs to spaces 2012-09-05 20:15:20 +01:00
Nay
cc28161670 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2012-09-05 20:09:48 +01:00
Nay
7da92908b8 Scripts/Commands: Fix .reload creature_template # (4.3.4 branch) 2012-09-05 19:55:55 +01:00
Nay
ca440756a8 Scripts/Commands: Fix .reload creature_template # 2012-09-05 19:50:09 +01:00
kaelima
7c971be3c5 Core/Misc: Fix some warnings and logic mistakes found by static code analysis 2012-09-05 17:18:05 +02:00
Shauren
147920c464 Merge pull request #7664 from Elron103/pull-requests 2012-09-05 06:40:56 -07:00
Elron103
6a701af13d Scripts/PitOfSaron: Fix Krick not casting Toxic Waste and Shadow Bolt 2012-09-05 15:34:07 +02:00
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
Nay
73172c67f0 Misc: Convert from CRLF to LF in cs_misc.cpp 
Also cleanedup whitespace
 2012-09-04 16:14:15 +01: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
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
Gacko
913645d5c7 Core: Blood furnace - Update method header to lastest rev 2012-09-03 22:25:26 +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
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
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
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
Shauren
10c9f0d0ed Scripts/Commands: Fixed compile 2012-09-02 18:40:08 +02: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
Nay
2e1de60593 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
 2012-09-01 22:19:13 +01:00