Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,918 Commits 4 Branches 146 Tags
7540cfedfc74b2c5e91ded052182fd3b02ca7b66
Commit Graph

18918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spp
7540cfedfc Core/Misc: Minor cosmetic change to avoid some merge conflicts 2013-01-14 10:02:06 +01:00
therzok
6d9ac921e0 Core/DBC: Fixed startup 
Closes #8930
 2013-01-13 14:25:54 +00:00
Warpten
2a2924fb50 Core/GuildFinder: Fixed a possible crash and a typo. 2013-01-12 22:10:47 +01:00
Shauren
ab038078d2 Merge pull request #8915 from Therzok/4.3.4 
DBC definitions and a warning fix.
 2013-01-11 15:03:06 -08:00
Marius Ungureanu
95fba877fe *Core/DBC: Updated structs. 
**AreaTableEntry
**CharStartOutfitEntry
**CurrencyTypesEntry
**FactionEntry
**GemPropertiesEntry
**GlyphPropertiesEntry
**LFGDungeonEntry
**MapEntry
**SkillLineAbilityEntry
**SpellEntry
**SpellPowerEntry
**SpellShapeshiftFormEntry
**TaxiNodesEntry
**Removed TeamContributionPoints.dbc parsing as it is deprecated since WotLK.
 2013-01-12 00:42:33 +02:00
Marius Ungureanu
c068adec52 Core/Opcodes: Warning fix. 2013-01-12 00:42:33 +02:00
Vincent_Michael
66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2013-01-11 19:10:10 +01:00
Vincent_Michael
ecbcca8794 Core: Whitespace cleanup 2013-01-11 14:49:38 +01:00
Vincent_Michael
6cd962ee71 Core: Fix non pch build 2013-01-11 14:21:39 +01:00
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
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
Nay
471cae1251 Merge pull request #8903 from joschiwald/spellscripts_reorder 
Misc: Reorder scripts in some script files and some cosmetic stuff
 2013-01-10 23:26:21 -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
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
Nay
9da1ff45b7 DB/Addon: Delete 1026 creature_addon rows and overwrite 98 creature_template_addon (phase 2.1) 
Conversion done with https://gist.github.com/4505135 (C#)
Thanks to Aokromes for the idea
 2013-01-10 19:42:24 +00:00
Nay
0ee5170552 DB/Addon: Delete 4012 redundant creature_addon rows (phase 2) 
Conversion done with https://gist.github.com/4504839 (C#)
Thanks to Aokromes for the idea
 2013-01-10 19:13:22 +00:00
Nay
fd4767bcd0 DB/Addon: Convert 43637 creature_addon rows to 2429 creature_template_addon rows 
Conversion done with https://gist.github.com/4504302 (C#)
Thanks to Aokromes for the idea
 2013-01-10 18:11:29 +00:00
Nay
fff86b7729 DB/SAI: Remove some redundant creature_texts using SMART_ACTION_CALL_FOR_HELP 2013-01-10 15:41:10 +00: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
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
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
Vincent_Michael
f9c193d27d DB/Spells: Add missing sql in 669e2ed20f 2013-01-09 17:29:27 +01:00
ZxBiohazardZx
d9339cea60 DB/SAI: Fix startup DB errors 2013-01-09 15:59:15 +00:00
Spp
25d35bacf9 Fix incorrect sql name 2013-01-09 16:39:57 +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
Pitcrawler
ecfb762346 DB/SAI: You Reap What You Sow, closes #8827 2013-01-09 13:17:31 +01:00
Vincent_Michael
9f9f797d5d Scripts/TOCR: Fix some faction champions crash 
Closes #8393
 2013-01-08 23:01:26 +01:00
Gacko
e102629601 DB/Quest: Raise the Barricades 
Thanks to @Nevadas. Solves #8877
 2013-01-08 21:33:28 +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
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
6ba128b2b2 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore 2013-01-07 20:19:47 -03:30
Malcrom
70977f3097 Core/Scripting: Misc fixes 2013-01-07 20:18:47 -03:30
ZxBiohazardZx
c3134bc6cd DB/Creature: Remove ALOT of auras and creature_addon definitions, all these entries should be handled by SAI already, if not then SAI should be fixed 2013-01-08 00:45:44 +01:00
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
w1sht0l1v3
de3d507cc1 DB/SAI: Proper script for Snowfall Glade Pup SAI. 2013-01-08 00:24:24 +02:00