Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
26,638 Commits 2 Branches 1 Tag
d7ec960348a45739b7b730eed749ffecabaa2cbb
Commit Graph
26638 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carbenium 1940583e36 Fix merge error 2015-07-21 18:38:49 +02:00
Carbenium 68fd138476 Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
 2015-07-21 18:30:05 +02:00
Carbenium 9f1d71a53f Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2015-07-21 18:22:27 +02:00
Carbenium 63df41b6b2 Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_21_00_world.sql
 2015-07-21 18:17:08 +02:00
Carbenium 38027226ff Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
 2015-07-21 18:04:43 +02:00
Carbenium 1350a08ee4 Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4 2015-07-21 17:54:19 +02:00
Rushor e29375a337 Update Deadwind Pass 2015-07-21 13:04:02 +02:00
Rushor e2974746ae DB/Misc: Fixup 2 Runtimeerrors 2015-07-21 12:43:27 +02:00
Rushor 6eb8b0428e DB/SAI: Update Azuremyst Isle Update 2015-07-21 12:20:45 +02:00
jackpoz aa042e94c2 Core/Collision: Fix race conditions in mmaps 
Fix a race condition in MMapManager happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.
 2015-07-20 20:52:36 +02:00
Aokromes a5fa52d54e DB/Misc: Fix startup errors 2015-07-20 19:28:20 +02:00
Rushor 8ab30a9b8d DB/SAI: Update Ashenvale 2015-07-20 19:22:25 +02:00
Aokromes 1a78edfd1e DB/Misc: Fix startup errors 2015-07-20 14:44:06 +02:00
DDuarte 3c4484d782 Scripts/ScarletEnclave: Add weapons to Unworthy Initiate 
Closes #14954
Closes #14955

(cherry picked from commit 673648ee6507597837bd2c8a7a78f425d139baea)
 2015-07-20 01:16:47 +01:00
DDuarte 24ae640de3 Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid 
Additions to cb0e6cac63638fd229cce16c341c6d3d2d77d0d9

(cherry picked from commit 57da378dea2b13c092dab71b181c859790e41b99)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
 2015-07-20 01:16:06 +01:00
Rushor a14a626c3a DB/SAI: Update Zul'Farrak 2015-07-20 00:19:17 +02:00
Rushor 0350088fd2 DB/Pathing: Dragonblight - Lights Trust + Jintha'kalar + Border Zone to Zul'Drak 
* also spawn missing Creatures for Border Zone to Zul'Drak
 2015-07-19 23:23:33 +02:00
Aokromes a2bfa0f147 DB/Misc: More other branches fixes 2015-07-19 23:09:12 +02:00
Aokromes 1c0cf6021b DB/Misc: Other branches fixes 2015-07-19 23:02:24 +02:00
Aokromes 5bfbf43699 DB/Misc: Fix startup errors 2015-07-19 22:53:34 +02:00
Aokromes 6f4c499296 DB/Misc: Fix more startup errors 2015-07-19 22:41:21 +02:00
Aokromes 4c1fbb5a9f DB/Misc: Fix more startup errors 2015-07-19 22:35:47 +02:00
Aokromes 51904fde02 DB/Misc: Fix some startup errors 2015-07-19 22:14:05 +02:00
Aokromes 7c0fe8f957 DB/Misc: More 3.3.5a fixes 2015-07-19 22:06:14 +02:00
jackpoz ca7f31c6cd Core/Collision: Fix race conditions in vmaps 
Fix a race condition in VMapManager2 happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.
 2015-07-19 21:10:27 +02:00
Rushor 51118b07cf DB/Pathing: Dragonblight - Scarlet Point 2015-07-19 20:57:35 +02:00
Aokromes 88cbf569a2 Fix another typo 2015-07-19 20:37:25 +02:00
Aokromes 8164d51071 Fix typo 2015-07-19 20:33:59 +02:00
Aokromes 2cc329a921 DB/Misc: Db already renamed 2015-07-19 20:13:12 +02:00
Aokromes 7702e422ac DB/Misc: Typo fix 2015-07-19 20:06:35 +02:00
Aokromes d3fec662dd DB/World: Backport schema changes from 6.x branch (renames) 2015-07-19 20:01:43 +02:00
Aokromes bedcc764f4 DB/Misc: Fix imports 2015-07-19 18:59:38 +02:00
Aokromes 5775457fb4 Fix Compile 2015-07-19 18:42:24 +02:00
Aokromes 4dc5890d53 Newlines.. 2015-07-19 18:33:24 +02:00
joschiwald 45d5ad270c Core/Spells: Renewed Hope also affects Flash Heal 
Closes #15037
 2015-07-19 18:19:08 +02:00
Aokromes ff57518d94 DB/Misc: forgot this 2015-07-19 18:04:41 +02:00
Aokromes 2210384468 DB/Misc: More 3.3.5a fixes 2015-07-19 18:02:04 +02:00
Rushor 5a2452f7d6 DB/SAI: Frigid Necromancer 
* some creatures near the Shrine should always cast this channel
 2015-07-19 17:44:00 +02:00
Aokromes 3e7bfbcaf7 DB/Misc: More 3.3.5a fixes 2015-07-19 17:41:33 +02:00
Aokromes 92565e06b9 DB/Misc: More db fixes from 3.3.5a 2015-07-19 17:29:33 +02:00
Aokromes a18dcd5888 DB/Misc: More 3.3.5a Fixes 2015-07-19 17:20:15 +02:00
Aokromes be1f4141ca DB/Misc: More 3.3.5a fixes 2015-07-19 17:11:30 +02:00
Rushor 1048de52bd DB/Pathing: Dragonblight - Jortun 2015-07-19 17:02:12 +02:00
Aokromes 29a57ba885 DB/Misc: More 3.3.5a Fixes 2015-07-19 17:01:42 +02:00
Aokromes 8aa6ca6ad4 gree 2015-07-19 16:55:45 +02:00
Aokromes 8b177c9096 DB/Misc: rename files 2015-07-19 16:52:45 +02:00
Aokromes bfc471a4b2 DB/Misc: More 3.3.5a fixes 2015-07-19 16:51:15 +02:00
Rushor ab42772f8e DB/Creature: Crystalline Ice Giant - Add missing 'Boulder Miss'-Emotes 2015-07-19 16:38:11 +02:00
Aokromes 67f3ba0577 DB/Misc: More 3.3.5a fixes 2015-07-19 16:36:36 +02:00
Aokromes 6761821881 DB/Misc: More 3.3.5a fixes 2015-07-19 16:28:55 +02:00