Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,028 Commits 4 Branches 146 Tags
224c7dc6ae9e79b714ed3583db216ef368ecc080
Commit Graph

8437 Commits

Author SHA1 Message Date
Carbenium
224c7dc6ae Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4 
Conflicts:
	README.md
	sql/updates/world/2015_04_04_00_world.sql
	sql/updates/world/2015_04_04_01_world.sql
	sql/updates/world/2015_04_05_06_world_335.sql
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_account.cpp
	src/tools/map_extractor/System.cpp
	src/tools/vmap4_extractor/adtfile.cpp
 2015-07-22 00:54:34 +02:00
Carbenium
963150dc8e Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
 2015-07-22 00:37:27 +02:00
Carbenium
fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4 
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
 2015-07-22 00:26:09 +02:00
Carbenium
79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Carbenium
c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Rushor
e29375a337 Update Deadwind Pass 2015-07-21 13:04:02 +02:00
Rushor
6eb8b0428e DB/SAI: Update Azuremyst Isle Update 2015-07-21 12:20:45 +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
Rushor
a14a626c3a DB/SAI: Update Zul'Farrak 2015-07-20 00:19:17 +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
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
4dc5890d53 Newlines.. 2015-07-19 18:33:24 +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
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
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
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
Aokromes
993d51ed4c DB/Misc: More 3.3.5a fixes 2015-07-19 16:21:07 +02:00
Aokromes
3922c87f12 DB/Misc: 3.3.5a Branch fixes 2015-07-19 16:06:08 +02:00
Aokromes
63f96a2823 DB/Creature: Misc creature_template_addon for Hyjal mobs 
By Creedem
 2015-05-27 21:15:57 +00:00
Aokromes
e0af7917ab DB/Gameobject: Add basic spawns to Hyjal 
By Creedem
 2015-05-27 21:12:29 +00:00
Aokromes
e8c52c83e7 Meh, newline. 2015-05-27 20:48:48 +00:00
Aokromes
82aa5edd62 DB/Creature: Add basic spawns to Hyjal 2015-05-27 20:44:20 +00:00
Rushor
82521ac79d DB/Quest: Breakout! 
closes #14475
 2015-05-27 21:47:16 +02:00
Aokromes
073d749e6f DB/Creature: Fix loot for High Priest Venoxis 
By NorthStrider, updated by xjose93, closes #14395
 2015-05-09 23:40:53 +02:00
Aokromes
681380dd84 DB/Creature: Loaned Wind Rider 
By Kilyana, updates #4484
 2015-04-18 16:06:56 +02:00
Aokromes
90658b5cd8 DB/Waypoint: Add missing paths for Lieutenant Valorcall & Forsaken Courier 
By Kittnz, closes #14538
 2015-04-18 15:27:47 +02:00
Kittnz
b321f84a39 DB/Zone: Netherwing Ledge Part 2 
- Cleanup on the Dragonmaw Ascendant spawns
- Updated Dragonmaw Ascendant positions
- Added waypoints too Dragonmaw Ascendant
 2015-04-07 23:05:03 +02:00
Kittnz
869955e03c DB/NPC: Goblin Merc spawn and some adjustment on Dragonmaw Base Camp 
by @Killyana

Closes #14453
 2015-04-07 23:03:02 +02:00
Dr-J
dcd36c1bf6 DB/Gossip: Add some missing gossips 
Add missing Gossips from Diremaul North
 2015-04-07 18:56:35 +01:00
Dr-J
210e45e303 DB/Quest: Steamtank Surprise 
By @Killyana, Initial work by @Kirkhammett

Closes #1866
 2015-04-06 22:06:57 +01:00
Dr-J
ee02377252 DB/Object: Nether Drake Egg 
By @Killyana

Closes #6284
 2015-04-06 19:25:50 +01:00