Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-10 03:59:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,038 Commits 4 Branches 147 Tags
f7d3600e7e7ffaba971b77e4371a705e55593cfd
Commit Graph

4689 Commits

Author SHA1 Message Date
Subv
f7d3600e7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-10-04 19:39:09 -05:00
Kandera
63d5444f64 Core/Battleground: only spawn the generals in ioc once the north or south gate has been destroyed. Closes #3022 2012-10-04 09:50:26 -04:00
kandera
6a8706a725 Merge pull request #7944 from Trista/master 
Scripts/Oculus: Fixes here and there, implement phasing
 2012-10-04 05:58:32 -07:00
Spp
8f65bc00a7 Fix compile without PCH 2012-10-04 13:41:56 +02:00
Spp
e1bee86ee6 Core/Battlegrounds: Remove no longer needed files BattlegroundAA/BattlegroundRB 2012-10-04 12:58:52 +02:00
Spp
2c961814c1 Core/Battleground: Some minor optimizations here and there. 2012-10-04 12:49:58 +02:00
Spp
2a55f2d9e0 Core/Battlegrounds: Minor optimization when checking if player left start zone 2012-10-04 11:31:00 +02:00
Spp
ddf494d78b Core/Battlegrounds: Optimize internal battleground data storage (from Array MAX_BATTLEGROUND_TYPE_ID to std::map) 2012-10-04 10:57:32 +02:00
Spp
58c01c140d Core/Battleground: Make Battleground queues and Free slot queue structures private. 2012-10-04 10:39:37 +02:00
Spp
02d68e4610 Core: Fix build without PCH 2012-10-03 15:40:01 +02:00
Dimitro
c299e8340c Core/Misc: Now attackers receiving all rewards, when the victim gone offline. 2012-10-03 14:13:14 +03:00
thesensei
91367bb39f Core/Oculus: Fixes here and there, implement phasing 
* Implement phasing (sniffed)
    * Add drakes proper support (events, texts, conditions for spells), remove npc_spellclick_spells
    * Add proper support for Gossip npcs
    * Removed the arcane shield Urom use first time we are about to meet him, because he only get it after he spawns a wave, added Evocation casts from sniff/retail that also break the teleportation visual bug
    * Some db updates based on Aokromes sniffs
    I intended to do it all, but there are core issues I have no knowledge to fix and I don't want to jump to other things before fixing them. :) So, I will submit boss updates, if I ever fix them. There are still stuff do do for drakes spells left from before.
    * Majour thanks to Shauren for helping me with summoning spells and w/e I ask him and all who answered my questions.
 2012-10-02 22:13:40 +03:00
Kandera
94b2f90a5a Core/Spells: fix typo from 0f85a1d4f3 2012-10-02 11:58:27 -04:00
Kandera
0f85a1d4f3 Core/Spells: Fix seal procs from tiny abom in a jar. Closes #3463 2012-10-02 10:58:11 -04:00
Kandera
c85c0c549a Core/Spells: when charges are removed by a proc they should be handled with AURA_REMOVE_BY_DEFAULT. Closes #7910 2012-10-02 10:23:36 -04:00
Spp
7831ecdb18 Core: "Initial support for C++11 compilers" 2012-10-02 15:06:19 +02:00
Spp
380db44583 Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct 2012-10-02 12:17:42 +02:00
Spp
f8846cdeaf Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer 2012-10-02 11:54:41 +02:00
Subv
816595613b Merge branch 'master' of github.com:TrinityCore/TrinityCore 2012-09-30 17:46:20 -05:00
Nay
4c3266c7af Tools&Core: Whitespace cleanup 
No one likes whitespace, right?
 2012-09-30 15:52:10 +01:00
Nay
746252fe4e Merge remote-tracking branch 'origin/master' into mmaps 2012-09-30 15:43:20 +01:00
Nay
39dba3f22f Merge pull request #7891 from tibbi/title_converter 
adding Title converter to faction converter, original author Silinoron
 2012-09-30 07:40:51 -07:00
Nay
0eb86ac370 Merge pull request #7896 from tibbi/wsg 
some WSG improvements
 2012-09-30 07:38:20 -07:00
Nay
8a18449a74 SQL: Rename file merged in PR; Core: cleanup whitespace and tabs 2012-09-30 15:33:56 +01:00
Subv
5c9e917e5e Core/MMaps: Removed an incorrect call to GetHeight 
Tools/MeshExtractor: Fixed a crash caused by calling fclose in a NULL stream
 2012-09-29 16:19:33 -05:00
Subv
a706b8027a Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-09-28 17:56:08 -05:00
tibbi
dcf68a02f6 typo 2012-09-28 19:54:17 +01:00
Kandera
cb8fc503dd Core/Battlefield: revert part of previous commit to fix build. 2012-09-28 10:41:44 -04:00
Kandera
db455e317e Core/Battlefield: fix build from previous commit 2012-09-28 09:45:50 -04:00
Subv
431db10e1a Core/Battlefield: fix world states on player login for wintergrasp 2012-09-28 09:44:34 -04:00
tibbi
45af997cca some WSG improvements 
* correct worldstates
* remove focused/brutal assault on a flag capture
 2012-09-28 14:39:06 +01:00
tibbi
404a036fa9 adding Title converter to faction converter, original author Silinoron 2012-09-27 22:38:19 +01:00
kaelima
138c52c967 Core/Battleground: Change notice about unhandled areatriggers to debug info and removed the GM notice. 
Added comment for a field in HandleBattlefieldListOpcode. And removed useless bool in BattlefieldWG::OnGameObjectCreate.
 2012-09-27 22:15:06 +02:00
kandera
8408c52c40 Merge pull request #7883 from tibbi/shield_generator 
correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT
 2012-09-27 09:35:08 -07:00
tibbi
5c4832c33e Correctly update visibility for transports, author GriffonHeart 2012-09-27 11:13:36 +01:00
tibbi
3fae05f6f3 correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT 2012-09-27 00:31:00 +01:00
Subv
693bdc6ce6 Miscellaneous: Minor codestyle change. 2012-09-26 12:17:26 -05:00
Kandera
15663749a6 Core/Spells: fix gnomeregan pride. Closes #5721 thx gecko32 2012-09-26 10:32:39 -04:00
Kandera
a3b32cf2c5 Core/Battlefield: remove duplicate if. probably due to bad merge 2012-09-26 09:14:08 -04:00
Kandera
c5ada4b487 Core/Spells: fix typo from previous commit that caused a crash. 2012-09-26 09:11:30 -04:00
Subv
bb6ce2b2c9 Core/MMaps: Only unload the navMeshQuery when instances are unloaded, suggestion by @Vlad852 
closes #7631
 2012-09-25 12:37:25 -05:00
Subv
33994351ff Core/Configs: Removed vmap.petLOS option in the worldserver config, it was intended to somewhat fix the lack of pathfinding, its not needed anymore. 
Closes #7817
 2012-09-25 12:22:02 -05:00
Nay
6dae8a5a49 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-25 09:27:08 +01:00
Kandera
5adc3d28a4 Core/Player: fix teleporting while on vehicle. Closes #7812 thx joschiwald 2012-09-24 12:08:25 -04:00
kandera
c0c64da286 Merge pull request #6788 from Vincent-Michael/charmer 
Core/Spells: Fix no combo points after Mind Control
 2012-09-24 07:55:32 -07:00
Kandera
dc935ef8b1 Core/Spells: fix beacon of light being on a non player. 2012-09-24 10:37:58 -04:00
kandera
a4e3709dd3 Merge pull request #7811 from Faq/SplitDamage2 
Core/Spells: Implementing some hooks for split damage taken, fixes the l...
 2012-09-24 05:24:01 -07:00
Nay
df0519607c Merge remote-tracking branch 'origin/master' into mmaps 2012-09-23 22:17:52 +01:00
Nay
a7386bd1b3 Scripts: Fix some code style issues in scripts 2012-09-23 22:16:28 +01:00
Nay
91fd408446 Merge pull request #7842 from Elron103/pull-requests2 
Core/GameObject: Implement method GetDisplayId, use it for GameObjectModels
 2012-09-23 07:49:18 -07:00