araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 22:49:39 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,853 Commits 17 Branches 140 Tags
0f049907d2c19ec12e08b065d7721f694479aa64
Commit Graph

22853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael 0f049907d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-29 09:59:03 +02:00
Aokromes 414554aefa DB/Creature: Fix even more creature templates 2014-04-29 06:31:35 +02:00
Aokromes 40e8e541ac DB/Creature: Fix even more creature templates 2014-04-29 05:10:03 +02:00
Kinzcool 1d8aa0b6b1 DB/SlavePens: Corrected a lot of wrong Slave Pens spawns 2014-04-28 20:21:35 -04:00
Vincent-Michael 65ae868cc8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-04-28 23:00:41 +02:00
Vincent-Michael ba8959b733 Core/MSVC: Remove double warning disables 2014-04-28 22:44:56 +02:00
Vincent-Michael 4dfe3246fa Core: Fix warning 2014-04-28 22:32:01 +02:00
Aokromes 08060994a9 DB/Creature: Fix even more creature templates 2014-04-28 22:20:20 +02:00
Aokromes 54a4594a9c DB/Creature: Fix even more creature templates 2014-04-28 21:59:53 +02:00
Aokromes b0f319184f DB/Creature: Fix even more creature templates 2014-04-28 21:32:23 +02:00
jackpoz d0cc723d2d Scripts/Commands: Fix crash in ".wp modify wpadd" 
Remove the old unsupported "wpadd" subcommand of ".wp modify" .
Closes #11955
 2014-04-28 20:50:47 +02:00
Aokromes d0fb9910dd DB/Creature: Fix even more creature templates 
Yes, i know this increases startup errors.
 2014-04-28 20:39:26 +02:00
joschiwald 84bff76ba0 Core/Misc: remove some obsolete parameters 2014-04-28 20:05:36 +02:00
joschiwald f388020366 Merge pull request #11948 from MitchesD/misc 
Scripts/Azuregos: converted to EventMap and WorldBossAI
 2014-04-28 19:58:17 +02:00
MitchesD 0c0d0ed9e5 Scripts/Azuregos: converted to EventMap and WorldBossAI 2014-04-28 19:52:08 +02:00
Vincent-Michael 6bc740f312 SQL: Fix typo (thx @cr4st) 2014-04-28 17:39:21 +02:00
Vincent-Michael d8a3d2ff0f DB/Command: Added missing data in 6045c05e0d 2014-04-28 16:52:51 +02:00
Vincent-Michael 1fd6210aa5 SQL: Update old .sql files to keep consistency with auth_database.sql 
Also update characters_database.sql (generated by mysqldump)
 2014-04-28 13:47:08 +02:00
Vincent-Michael 6045c05e0d DB/RBAC: Fix rbac_permissions order 2014-04-28 13:38:26 +02:00
Aokromes ad7782b3ea DB/Creature: Fix even more creature templates 2014-04-28 10:12:15 +02:00
Aokromes df9255aa0e DB/Creature: Fix even more creature templates 2014-04-28 09:58:44 +02:00
Vincent-Michael 221fde5711 Core: Fix warning 2014-04-28 09:55:11 +02:00
Vincent-Michael f4fd258ad1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-28 09:49:24 +02:00
Vincent-Michael f743ca2816 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2014-04-28 09:42:20 +02:00
Aokromes bd6474b369 DB/Creature: Fix even more creature templates 2014-04-28 09:40:19 +02:00
Vincent-Michael 57cf043aec Core/Creature: Missed changes in c536305e3a 2014-04-28 09:19:37 +02:00
Kinzcool c536305e3a Core: Droped faction_H field -- only one faction table is necessary 2014-04-27 18:13:55 -04:00
Vincent-Michael a1e8cad703 Core/Creature: Added creature template log for default creature is greater than difficulty creature 2014-04-27 23:12:21 +02:00
Vincent-Michael f6e53e45a9 Core/Creature: Addet "possible fix" log for creature_template errors 2014-04-27 23:12:20 +02:00
Vincent-Michael a4dc654aea Core/Creature: Added creature template log for default creature is greater than difficulty creature 2014-04-27 23:11:11 +02:00
jackpoz 26f2a7af2f Merge pull request #11957 from Unholychick/patch-1 
Fix percentage HOTs proccing everything
 2014-04-27 22:52:05 +02:00
Lucas 1719e19572 Fix percentage HOTs proccing everything 
Unforeseen sideeffect of 057169c21c
Percentage HOTs are not supposed to proc anything at all.
Closes: https://github.com/TrinityCore/TrinityCore/issues/11914
 2014-04-27 22:47:54 +02:00
Vincent-Michael 2f4059e9b2 Core/Creature: Addet "possible fix" log for creature_template errors 2014-04-27 21:28:54 +02:00
Aokromes c7221536de DB/Creature Fix even more hard modes values 
I have this is annoying thing?
 2014-04-27 21:11:14 +02:00
Aokromes 6caa8e309a DB/Creature: Link more creatures with their hard modes 
Thx jackpoz by the sql to ease my life!
This will add a flood of startup errors, don't open new tickets, they will be fixed.
 2014-04-27 19:47:53 +02:00
Vincent-Michael 908870e23f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-27 13:56:56 +02:00
Discover- 91c6c8a911 Merge pull request #11945 from Dehravor/trade 
Core/Trade: Correction of distance checking
 2014-04-27 12:32:32 +02:00
Aokromes 3fc5d0670c DB/Creature Fix even more hard modes values 2014-04-27 11:35:38 +02:00
Aokromes dac5eb3a8a DB/Creature: Fix even more hard modes values 2014-04-27 09:56:23 +02:00
Aokromes 4b704437a1 DB/Creature: Fix more hard modes values 2014-04-27 09:29:07 +02:00
Aokromes 05e107f32e DB/Creature: Fix some hard modes values 2014-04-27 08:51:51 +02:00
Aokromes 81c9add7c4 DB/Creature: Link some creatures with their hard modes 
This will add some startup errors.
 2014-04-27 08:02:34 +02:00
Aokromes eb722bf220 DB/Misc: Fix few typos 2014-04-27 04:51:35 +02:00
Aokromes 9ed38880e8 DB/Creature: Fix more factions 2014-04-27 04:43:51 +02:00
Kinzcool cc9875d226 DB/Gossips: Added some missing gossips 2014-04-26 22:20:05 -04:00
w1sht0l1v3 c20d0cb77e Scripts/Sholazar Basin: Reconnaissance Flight (12671) 
Add workaround for the player/accessory mounting issue.
Some small additions.
Closes: 9443
 2014-04-27 02:23:33 +03:00
Vincent-Michael de281846cc Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 14:51:00 +02:00
joschiwald 113e6b0162 Really fixed build and warnings 2014-04-26 14:42:56 +02:00
Aokromes 0eaa32a7cc DB/Creature: Fix typos on dc8a7a6 
**CENSORED** npcs with same name.
 2014-04-26 14:21:13 +02:00
Vincent-Michael 3ef7a7299f Core: Fix build 2014-04-26 13:07:00 +02:00