Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,690 Commits 4 Branches 146 Tags
dd61ba2844fc96b3344183fe0b05ce65985fa8be
Commit Graph

7431 Commits

Author SHA1 Message Date
Venugh
c9eb42f246 Core/Commands: Implemented mmaps commands. 2012-09-06 00:36:24 +02: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
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
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
Subv
c0b031af4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-09-03 16:11:18 -05: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
Nay
c7fed98b9d Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	dep/PackageList.txt
 2012-09-03 15:51:34 +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
Gacko
9060294ab0 Core: Quest 'The art of persuasion' - Typo 2012-09-02 11:54:02 +02:00
Nay
ffe8c75f17 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-01 22:20:33 +01: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
Nay
107bd5f5a3 Scripts: Fix non pch build 2012-09-01 00:11:44 +01: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
Trista
a8d514914b Core/Scripts: Improve Wyrmrest Defender gossip 
* Added conditions to only show default gossip, if not on quest 12372
* Else show other gossip text
* Add second gossip text on gossip select
* Remove close gossip - after a lot of videos turns out character close it by moving or clicking "goodbye"

Ref #1861
Closes #7594
 2012-08-31 14:48:10 -05:00
w1sht0l1v3
6fbe3a11ec DB/SAI: Taking on All Challengers & Defending Your Title 2012-08-31 14:48:07 -05:00
Myran2
db7b750e0c Scripts/Commands: Create a new group of commands, .cheat, and add new and move old commands to it: 
Changes:
- .explorecheat is now .cheat explore
- .waterwalk is now .cheat waterwalk
- .taxicheat is now .cheat taxi

New commands:
- .cheat god
- .cheat casttime
- .cheat cooldown
- .cheat power

(Descriptions available in the SQL file / in-game)

Inspiration on ArcEmu commands
Closes #7569
 2012-08-31 14:48:02 -05:00
Nay
8bfdfd18cd Scripts: Fix a merge issue, thanks cyberbrest 2012-08-31 19:48:26 +01:00
Trista
305b8d2d69 Core/Scripts: Improve Wyrmrest Defender gossip 
* Added conditions to only show default gossip, if not on quest 12372
* Else show other gossip text
* Add second gossip text on gossip select
* Remove close gossip - after a lot of videos turns out character close it by moving or clicking "goodbye"

Ref #1861
Closes #7594
 2012-08-31 14:20:55 +01:00
Santiago
0af00a8283 DB/SAI: Remove Lol'kira the Krone and Thorim cpp scripts, handled by SAI 2012-08-30 23:32:03 -03:00
w1sht0l1v3
20e629d038 DB/SAI: Taking on All Challengers & Defending Your Title 2012-08-31 04:15:04 +03:00
Myran2
908ae08a0a Scripts/Commands: Create a new group of commands, .cheat, and add new and move old commands to it: 
Changes:
- .explorecheat is now .cheat explore
- .waterwalk is now .cheat waterwalk
- .taxicheat is now .cheat taxi

New commands:
- .cheat god
- .cheat casttime
- .cheat cooldown
- .cheat power

(Descriptions available in the SQL file / in-game)

Inspiration on ArcEmu commands
Closes #7569
 2012-08-31 01:26:21 +01:00
Subv
554e88dd63 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-08-30 19:16:09 -05:00
Nay
d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
 2012-08-30 23:06:19 +01:00
Nay
abbb896cfb Core: Fix many "errors"/warnings and coding style (2) 
Scripts; also reverted a change to AuthSocket

Errors were found using Cppcheck, open-source static analysis tool
 2012-08-30 22:44:03 +01:00
Gacko
a303bda320 Core: Quest - The art of persuasion 2012-08-30 20:27:21 +02:00
Kaelima
dd98331999 Merge pull request #7566 from Souler/fix_copy_weapon_auras 
Scripts/Spells: Fix Weapon Copy related auras.
 2012-08-30 03:36:40 -07:00
Souler
5ee99a9412 Scripts/Spells: Fix Weapon Copy related auras. 
Closes #3731
 2012-08-30 11:50:07 +02:00
Subv
532ddfcd40 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-08-29 17:36:09 -05:00
Nay
e909e5515b Scripts/Hellfire: Add missing include 2012-08-29 22:36:04 +01:00
Nay
872c239dbe Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 22:29:06 +01:00
Gacko
e07a8db6da Scripts/Hellfire: Rework Blood Furnace 2012-08-29 22:23:15 +01:00
Nay
aa9f2e9f18 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 14:01:38 +01:00
Nay
d6221fc4f7 Scripts: Fix code style after PR 2012-08-28 20:10:04 -05:00