Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-14 22:19:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,618 Commits 4 Branches 147 Tags
ef8a08ee2c52cd00f64f0283a8862bace4e09b21
Commit Graph

9086 Commits

Author SHA1 Message Date
krofna
dc30c63533 Script/AQ Implement Ayamiss the Hunter and fix screwup in my Ossirian 
Closes #8862

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-11 12:52:19 +00:00
ille
bb995fcad1 Core/maps: separate mutex for grid 2013-01-11 13:11:08 +01:00
Tuxity
a6c64c8c7e Core/Formulas: Fix rounding problem in conquest rating calculator. 2013-01-11 10:42:00 +01:00
Nay
efa094e893 Merge pull request #8581 from Butterfly69/patch-9 
Core/Spells:Beacon of Light
 2013-01-10 23:29:51 -08:00
joschiwald
0c16b95905 Misc: Reorder scripts in some script files and some cosmetic stuff 2013-01-11 04:18:02 +01:00
Marius Ungureanu
95cf2585bd *Core/Currency: - Fixed Tuxity's latest revisions to currency fixes. - Compilation fix. /slap Tuxity? XD 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-11 00:51:56 +00:00
joschiwald
89490e4d7f Core/SpellScripts: implement Spell Proc Hooks and use it in old and new proc system 
Hooks:
- DoCheckProc: executed when aura checks if it can proc
- DoPrepareProc: executed before aura procs (possibility to prevent charge drop/cooldown)
- OnProc: executed when aura procs
- OnEffectProc: executed when aura effect procs
- AfterEffectProc: executed after aura effect proced
- AfterProc: executed after aura proced and charges removed

using PreventDefaultAction() in DoPrepareProc will prevent charge drop and cooldown

default execution of a proc can prevented in OnEffectProc with PreventDefaultAction()

Now we should be able to convert almost all procs from Unit::ProcDamageAndSpellFor to SpellScripts

Notes to old proc system:
- if a proc has a cooldown we must check it in spellscript and add it when we handle the proc
- behavior with charge drops is possible undefined (use PreventDefaultAction() in OnEffectProc to notify that the script is executed)
 2013-01-11 01:21:44 +01:00
Malcrom
ddea01290c Core/Scriptd: Rewrite :) 2013-01-10 20:50:32 -03:30
Malcrom
0b50520df7 Core/scripting: Updating Scholomance scripts 2013-01-10 20:08:30 -03:30
Blipi
ed21a589bb Quest 4901 "Guardians of the Altar" 2013-01-11 00:26:26 +01:00
Nay
8274e42e3d Core/SAI: Add 2nd parameter to SMART_ACTION_CALL_FOR_HELP to say "%s calls for help!" if enabled 
Similar to SMART_ACTION_FLEE_FOR_ASSIST "%s attempts to run away in fear!"
 2013-01-10 15:09:12 +00:00
Tuxity
91c4f2c2fb Core/Battleground: Fix asynch countdown timer for new players. close #8761 2013-01-10 15:38:39 +01:00
Vincent_Michael
e6c8cc91ca Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-10 14:52:34 +01:00
Tuxity
2f48fe7cf1 Core/Currency: 
- Fix a typo in conquest points formulas
- Correctly fix max justice and honor points
- Remove a previous fix when refunding an item, my mistake
ref #8892
 2013-01-10 14:18:14 +01:00
Warpten
3c8a957692 Core/GuildFinder: Fixed a missing typecast. Also correctly display the guild's achievement points. 2013-01-10 12:00:11 +01:00
Warpten
c9650de789 Scripts/ZulAman: Fixed a crash caused by the grid. 
Closes #8885.
 2013-01-10 10:41:46 +01:00
Tuxity
d754ca16fb Core/Battleground: Fix team logo at countdown timer expire by @Vincent-Michael 
Fix typo when refunding currencies, thx @kennylive
 2013-01-10 10:02:32 +01:00
Vincent_Michael
899ffde1f9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-09 21:15:41 +01:00
Vincent_Michael
7210ffe34d Core: Fix warnings 2013-01-09 21:14:12 +01:00
Tuxity
71b0b30712 Core/Battleground: 
- Fix team logo after countdown timer expire. close #8887
- Add more options with justice and honor points in conf file, also fix a wrong cap value.
- Grant back currencies when refunding an item and fix price.
ref #8892
 2013-01-09 20:37:02 +01:00
Spp
677ed18080 Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon 
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
 2013-01-09 15:15:42 +01:00
Spp
5f15600e7a Core/Build: Fix linking and sooo many compile warnings 2013-01-09 13:13:39 +01:00
Vincent_Michael
9f9f797d5d Scripts/TOCR: Fix some faction champions crash 
Closes #8393
 2013-01-08 23:01:26 +01:00
Vincent_Michael
db330750b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-01-08 16:32:54 +01:00
Vincent_Michael
d36d2eac76 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-08 16:28:37 +01:00
Vincent_Michael
20ab789fe7 Core: Fix build with Debian 7.0 
Closes #8882
 2013-01-08 16:26:45 +01:00
Malcrom
7c5597a697 Core/Scripting: Update Scholomance Scripts 2013-01-08 00:47:20 -03:30
Malcrom
f81f8ec41b Core/Scripting: Compile fix 2013-01-07 23:02:17 -03:30
Malcrom
43d73bebd0 Core/Scripting: Some cleanup 2013-01-07 22:48:40 -03:30
Malcrom
2a9fc5198b Core/Scripting: Move Nightbane text to creature text 2013-01-07 22:44:09 -03:30
Malcrom
0226048686 Core/Scripting: Update Script for Postmaster Malown 2013-01-07 22:13:04 -03:30
Malcrom
0105bc849f Core/Scripting: Misc clean up and a warning fix 2013-01-07 21:47:38 -03:30
Malcrom
70977f3097 Core/Scripting: Misc fixes 2013-01-07 20:18:47 -03:30
Malcrom
1c77eee917 Core/Scripting: Move Text for Shirrak the Dead Watcher to creature text 2013-01-07 19:50:31 -03:30
Malcrom
5ce88118ee Core/Scripting: Move Text for Timmy the Cruel to creature text 2013-01-07 19:27:35 -03:30
Vincent_Michael
8c58184535 Core: Fix non pch build 2013-01-07 23:40:20 +01:00
Vincent_Michael
8f36383d39 Core: Fix build 2013-01-07 23:28:03 +01:00
Malcrom
a8374bd001 Core/Scripting: Some cleanup 2013-01-07 18:39:30 -03:30
blub
be5d3e5fd8 Merge pull request #8755 from krofna/crofixes 
Script/AQ: Implement Buru the Gorger
 2013-01-07 14:04:53 -08:00
blub
669e2ed20f Merge pull request #8725 from krofna/krefixes 
Script/AQ: Rewrite Skeram
 2013-01-07 14:03:28 -08:00
Malcrom
55d3e8adaa Core/Scripting: Move Text for Zul'jin to creature text 2013-01-07 18:14:30 -03:30
Malcrom
61fa397117 Core/Scripting: Move Text for Baron Rivendare to creature text. 2013-01-07 17:22:14 -03:30
Malcrom
3d1f61b278 Core/Scripting: Move Text for Ayamiss the Hunter to creature text 2013-01-07 16:29:20 -03:30
Malcrom
609232dfbe Core/Scripting: Move Text for Archavon the Stone Watcher to creature text 2013-01-07 16:12:49 -03:30
Malcrom
74b4dbec3f Core: Scripting: Convert Text for boss Archaedas to creature text 2013-01-07 15:54:11 -03:30
Malcrom
9d1ad8ab3a Core/Scripts: Move text for Boss Akil'zon to db. 2013-01-07 15:31:38 -03:30
Malcrom
601f118f29 Core/Scripting: Move some text to creature text. 2013-01-07 14:20:52 -03:30
Malcrom
1bb8b9325a Core/Scripting: Script Updates 2013-01-07 12:48:28 -03:30
Malcrom
0533d63a77 Core/Scripting: Gong Event updates 2013-01-07 12:34:58 -03:30
Vincent_Michael
b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-01-07 16:57:39 +01:00