Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-14 14:09:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,447 Commits 4 Branches 147 Tags
1106eadac6df7d94de04f9f1642d53f37ca847bc
Commit Graph

30447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leak
aedb824e99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-07-16 17:53:33 +02:00
Shauren
3249986ba8 Buildsystem/GCC: Fixed release linking errors 2014-07-16 13:09:56 +02:00
Aokromes
b5cb3da857 DB/Misc: Adition to 9f0ec86 
By dr-j
 2014-07-16 11:53:54 +02:00
Aokromes
a61cea1e54 DB/Misc: Fix Gossip on Kor'kron overseer 
By dr-j, closes #12514
 2014-07-16 08:37:35 +02:00
Aokromes
e373f75ceb DB/Quest: Fix Banishing Portal 
By dr-j, closes #12510
 2014-07-16 00:18:01 +02:00
Aokromes
9f0ec867c4 DB/Quest: Sarkoth 
By dr-j, closes #12511
 2014-07-16 00:11:40 +02:00
Chaplain
68398a559e [Auth\Worldserver] Use boost to load console arguments. (Added a few style changes and cmake fix) 
Conflicts:
	src/server/worldserver/Main.cpp
 2014-07-15 18:15:55 +02:00
Aokromes
7be070359b DB/SAI: Adition to 70c82a3 
By dr-j
 2014-07-15 12:44:54 +02:00
Aokromes
d4e8eae705 DB/Creature: Stinker 
By dr-j, closes #12502
 2014-07-15 07:14:02 +02:00
Dr-J
3629c4128f DB/Misc: Fix Frogger (Naxxramas) 
Closes #12434
 2014-07-15 00:26:02 +02:00
leak
ecde28d1c1 Replacing ACE based multi threading with PCQ 2014-07-14 22:51:13 +02:00
jackpoz
fe5d38ae7d Fix mmaps_generator build 
Remove old unneeded file breaking mmaps_generator build.
 2014-07-14 22:25:05 +02:00
Vincent-Michael
524cc6c2d9 Core/Battleground: Fix typo and small cleanup (again thx @joschiwald) 2014-07-14 21:31:16 +02:00
Vincent-Michael
06d9d33de3 Core/Battleground: Fix merge fail (thx @joschiwald) 2014-07-14 21:16:19 +02:00
Vincent-Michael
13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
 2014-07-14 21:01:55 +02:00
leak
a70fb4c306 Corrected order of inclusion in Define.h 2014-07-14 20:54:55 +02:00
joschiwald
14bbe3e2e9 Core/Battleground: fixed typo 
* and fixed some warnings
 2014-07-14 20:12:39 +02:00
Aokromes
70c82a385f DB/Creature: Script a lot of creatures 
By dr-j, closes #12498
 2014-07-14 19:07:47 +02:00
joschiwald
1088c27562 Core/Battleground: moved some arena related code into a generic arena class 
* fixed typo in random bg selection, that causes no bg is created if only one bg is enabled
* fixed swapped worldstates in Ring of Valor
 2014-07-14 18:31:16 +02:00
joschiwald
8e88a42420 Core/Battlefield: move complex methods from BattlefieldWG.h to BattlefieldWG.cpp 2014-07-14 17:59:22 +02:00
Vincent-Michael
f03617cd0f Core/Creature: Fix problems with neutral innkeepers 2014-07-14 14:13:45 +02:00
Vincent-Michael
6dba04c0cc Scripts/Commands: Fix warnings vs2014 ctp (no support) 2014-07-14 10:53:49 +02:00
Vincent-Michael
9506fd77fc Core: Fix warnings vs2014 ctp (no support) 2014-07-14 01:07:54 +02:00
Subv
df64cad535 Merge branch 'boost' of github.com:TrinityCore/TrinityCore into boost 2014-07-13 17:35:38 -05:00
Subv
aeaed5f007 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.h
 2014-07-13 17:35:16 -05:00
Aokromes
2beced7135 DB/Quest: Hive'Zora Scout Report 
By dr-j, closes #781
 2014-07-14 00:24:38 +02:00
leak
d45d741426 Removed dead ACE includes from mmaps gen (mt still needs rewrite) 2014-07-14 00:03:49 +02:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Subv
f14399d788 More warnings fixes 2014-07-13 16:49:56 -05:00
Subv
f6962f9c68 Fixed some compiler warnings 2014-07-13 16:40:31 -05:00
Aokromes
28e0f92229 DB/Misc: Update to badac94 
By dr-j
 2014-07-13 23:03:39 +02:00
Subv
a4f7211aed Fixed the worldserver not using the path to the config file as defined in cmake 2014-07-13 15:55:46 -05:00
jackpoz
5a84448ed7 Core/InstanceScript: Fix possible crash 
Store Boss doors/minions as GUID instead of GameObject*/Creature* to avoid accessing pointers to free'd memory.
 2014-07-13 22:47:22 +02:00
Aokromes
fa770897cc DB/Quest: Investigate the Alchemist Shop 
Original work by Rushor, finished by dr-j, closes #9717
 2014-07-13 22:40:47 +02:00
Aokromes
badac945f4 DB/Quest: Let Them Not Rise 
By dr-j, closes #12484
 2014-07-13 22:30:09 +02:00
Subv
87f830ca89 Fix a warning about abstract class not having a virtual destructor 2014-07-13 15:17:13 -05:00
Aokromes
5c9e8fa557 DB/Gameobject: Deeprun Chest 
Closes #12430
 2014-07-13 20:46:11 +02:00
Vincent-Michael
c88c1c6848 Core: Fix warning 2014-07-13 17:26:43 +02:00
Vincent-Michael
d920463fe5 Core/AreaTrigger: Remove useful check 2014-07-13 04:13:22 +02:00
Vincent-Michael
877fc267df DB/Player: Update player create info skills for 4.3.4 2014-07-13 00:26:03 +02:00
Vincent-Michael
ec263868af Core/Aura: Update InvisibilityType for 4.3.4 2014-07-13 00:08:15 +02:00
Subv
9ccce98661 Remove the need of manually declaring BOOST_ROOT in Linux systems if Boost was installed to the default locations 2014-07-12 16:27:55 -05:00
Aokromes
29e6765885 DB/Creature: Summoning the Princess 
By dr-j, closes #12370
 2014-07-12 20:31:00 +02:00
Vincent-Michael
0f5c481cd4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
 2014-07-12 18:08:30 +02:00
Shauren
6d8dbb5c4a Core/Misc: Renamed a few spell and skill line related methods to follow tc coding standards 2014-07-12 17:28:35 +02:00
Shauren
d91964912e Core/Skills: Fixed spells automatically learned from skill lines adding more skill lines 2014-07-12 17:27:26 +02:00
Aokromes
442a94fc68 DB/Quest: Solof's Booty 
By dr-j closes #9673
 2014-07-12 16:49:19 +02:00
Trisjdc
4a197ba22a Core/PathGenerator: Split raycast paths into more points for better path z normalization. Solves many of the 'falling underground with charge' issues 2014-07-12 13:13:38 +01:00
Vincent-Michael
3f0ce25d5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-12 05:09:46 +02:00
Vincent-Michael
2f03e04b87 Core/Player: 
- Fix merge fail
- Fix SkillRaceClassInfo structure
 2014-07-12 04:52:26 +02:00