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
21,301 Commits 4 Branches 146 Tags
be75ddc2bd99045e53523a06707526b233fd0c32
Commit Graph

3304 Commits

Author SHA1 Message Date
Vincent-Michael
be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
 2013-09-06 21:55:19 +02:00
joschiwald
e5af3e25f9 -.- 2013-09-06 21:18:07 +02:00
joschiwald
49e2ad73d2 Fixed build 2013-09-06 21:16:09 +02:00
joschiwald
9429251e2e Scripts/YoggSaron: fixed rewarding loot 2013-09-06 21:02:02 +02:00
joschiwald
adef15cd0f Core/Spells: add an other condition to SpellInfo::NeedsToBeTriggeredByCaster to correct spells with are wrongly triggered by target instead of caster 
- convert archavons rock shards to spellscript (now it works properly)
- add a spellscript for one spell that can't be corrected by this (and delete the sai hack, now i uses the correct spell)
 2013-09-06 20:57:38 +02:00
xjose93
35ef163703 Core/Commands: Fix .debug send opcode freeze if file dont exists. 2013-09-06 15:31:22 +02:00
Shauren
fe8252b2e2 Scripts/Commands: Check if creature entry is valid before attempting to spawn (fixes unneccessary error in logs) 2013-09-06 14:32:30 +02:00
Vincent-Michael
d25c2e7f5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp
 2013-09-05 16:46:14 +02:00
joschiwald
7ef1f0738b Core/Battlegrounds/IoC: fix fortress teleport pads 
(and replace a hack with an other hack)

Closes #5846
Closes #7993
Ref #8984
 2013-09-05 00:59:22 +02:00
Sebastian Valle
07d793b94b Core/Misc: Fixed some more issues found by static code analysis tools. 2013-09-03 17:31:02 -05:00
Sebastian Valle
2cfcf9d3ef Scripts/HallsOfReflection: Fixed a typo detected by static analysis tool. 2013-09-03 16:58:57 -05:00
Sebastian Valle
24f8b2b994 Core/Misc: Fixed some more issues found by code analysis tools. 2013-09-03 15:09:37 -05:00
Vincent-Michael
6514e21b7c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/System.cpp
 2013-09-03 21:03:09 +02:00
Sebastian Valle
5b95301de5 Core/Misc: Solved some issues found by static code analysis. 2013-09-03 13:38:50 -05:00
Vincent-Michael
611d51af98 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_debug.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-09-02 22:53:44 +02:00
MitchesD
5e03230f3d Scripts/HallsOfStone: Sjonnir, some improvements 
- rewritten to BossAI
- added spawn ordered by percent, according to official data

Closes #10702

Signed-off-by: joschiwald <joschiwald@online.de>
 2013-09-02 18:55:52 +02:00
joschiwald
3722fcb850 Scripts/HoL/HoS: changed some bosses to optional, doors are always open 2013-09-02 18:12:33 +02:00
Nay
9b92bc9409 Core: Fix compile with PCH enabled and warnings 
Few corrections to worldserver.conf
 2013-09-02 16:18:55 +01:00
joschiwald
579f969d6a Scripts/HallsOfStone: reworked InstanceScript 2013-09-02 16:31:35 +02:00
Nay
28f9317698 Core/RBAC: Move cast and characters commands to RBAC (using individual permissions) 2013-09-02 13:25:07 +01:00
Spp
f68471f142 Core/RBAC: Move message commands to RBAC (using individual permissions) 2013-09-02 13:01:50 +02:00
Spp
2d508387e5 Core/Commands: Move lookup commands to RBAC (using individual permissions) 2013-09-02 12:54:51 +02:00
Spp
eb73684952 Core/RBAC: Move list commands to RBAC (using individual permissions) 2013-09-02 12:25:32 +02:00
Spp
4219f45c85 Core/RBAC: Move lfg commands to RBAC (using individual permissions) 2013-09-02 12:17:46 +02:00
Spp
c0dfdeab1c Core/RBAC: Move learn commands to RBAC (using individual permissions) 2013-09-02 12:12:20 +02:00
Spp
2625e78f80 Core/RBAC: Move instance commands to RBAC (using individual permissions) 2013-09-02 11:58:14 +02:00
Spp
08ef6bd9f8 Core/RBAC: Move honor commands to RBAC (using individual permissions) 2013-09-02 11:53:22 +02:00
Spp
11233dbd73 Core/RBAC: Move guild commands to RBAC (using individual permissions) 2013-09-02 11:45:36 +02:00
Spp
015eee068b Core/RBAC: Move gobject commands to RBAC (using individual permissions) 2013-09-02 11:38:41 +02:00
Spp
29c57c3447 Core/RBAC: Move go commands to RBAC (using individual permissions) 2013-09-02 11:33:45 +02:00
Spp
1bccf67c09 Core/RBAC: Move gm commands to RBAC (using individual permissions) 2013-09-02 11:24:09 +02:00
Spp
fced8a896e Core/RBAC: Move event commands to RBAC (using individual permissions) 2013-09-02 11:20:05 +02:00
Spp
225691e0ae Core/RBAC: Move disable commands to RBAC (using individual permissions) 2013-09-02 11:17:15 +02:00
Spp
3e45640135 Core/RBAC: Move deserter commands to RBAC (using individual permissions) 2013-09-02 10:01:34 +02:00
Spp
f53c61c93e Core/RBAC: Move debug commands to RBAC (using individual permissions) 2013-09-02 10:01:34 +02:00
Spp
33d9da5060 Core/RBAC: Move cheat commands to RBAC (using individual permissions) 2013-09-02 10:01:34 +02:00
Aokromes
59667ee606 Core/Spells: move debug log into debug mode 2013-09-02 09:41:46 +02:00
Vincent-Michael
97fc632b9d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp
 2013-09-01 23:48:40 +02:00
Ascathor
722a6c143a Core/Account: Make account password change security variable and various changes 
Settings within worldserver.conf:

Three settings for secruity level:
0 - None - No change to current system
1 - Email - Always requires the email entered on registration for confirming.
2 - RBAC - Groups applied with the RBAC role always require the email entered on registration for confirming.

RBAC default to every group. Changed some logs to make it more clear what is going on at all.

Emails may now no longer exceed 64 chars. Current email is used as regmail.

On account creation, two emails are saved. Registration email and normal email. Normal email is relevant afterwards. Registration email can be changed by console ONLY.

Includes new commands and changes to existing ones:
.account fulfills several new functions:
* Still prints GM Level.
* If account has permission, it displays the current email. This is not defaulted to any group.
* Security level is displayed. Also displays if user has RBAC perm if RBAC security mode is selected
.account email allows user to change email with sufficient confirmation
.account set sec email allows higher sec with higher sec than account to change the normal email. Registrationemail remains untouched here.
.account set sec regmail allows console to change registration email.
.pinfo now displays the registration and normal mail.

Also fixes .learn all crafts.
Closes #10558
 2013-09-01 21:21:16 +02:00
Shauren
79d1b7f543 Scripts/Misc: Removed unused fields and fixed a warning about uninitialized value 2013-09-01 20:33:52 +02:00
joschiwald
e526e14d7e Core/Scripts: fix build 2013-09-01 13:43:56 +02:00
joschiwald
5c5b78c77c Scripts/Ulduar: fix mark of the faceless and add missing door handling 2013-09-01 13:25:52 +02:00
Shauren
d6fdd05493 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-01 00:59:58 +02:00
Nay
16fcac1991 Core/RBAC: Move bf commands to RBAC (using individual permissions) 2013-08-31 21:02:14 +01:00
Vincent-Michael
6c8d0e5405 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-31 21:52:15 +02:00
Vincent-Michael
22b71244a0 DB/Creature: Fix cords for quest "Death Comes From On High" 2013-08-31 19:33:14 +02:00
Vincent-Michael
e753a47162 DB/Sai: Fix quest credit for quest "Blessing of Incineratus" 2013-08-31 18:29:51 +02:00
Vincent-Michael
8fd1f46192 Scripted: Fix warning 2013-08-31 17:52:47 +02:00
Vincent-Michael
b1721a65ee Core/Spells: Fix quest credit for quest "Death Comes From On High" 2013-08-31 17:42:04 +02:00
joschiwald
ae36ddefec Core/Scripts: add creature_text to pet mojo 
Scripts/Karazhan/Moroes: cleanup a bit (should fixes mem leak)
 2013-08-31 16:48:37 +02:00