Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-14 05:59:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,601 Commits 4 Branches 147 Tags
c0c2e533a967640bd14553fa98916974e013e7bd
Commit Graph

15958 Commits

Author SHA1 Message Date
Vincent_Michael
c0c2e533a9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
 2013-02-21 00:45:02 +01:00
Shauren
59c3c6b8a6 Core/Players: Allow players to log out in combat when they are in resting area (logout in rest area is instant by default, but not when in combat) 2013-02-20 20:52:58 +01:00
Nay
65258666e0 Core/NPCs: Fix some equipment issues introduced with 028c72a9f2 
Also changed equips defaults to 0 (no equipment) instead of 1.

It seems that some parts of the original commit were reverted locally, my bad.
 2013-02-20 01:17:27 +00:00
Nay
4e59dab703 Core/DBLayer: Comment out MySQL client/server version mismatch warning 
MySQL version above 5.1 IS required in both client and server and there is no known issue with different versions above 5.1
 2013-02-20 01:17:26 +00:00
Nay
4540a1d24b Merge pull request #9168 from Kirkhammett/Ebonroc_Bwl 
Npc/Core: Was using Onyxia's Wing Buffet spell which can 1 shot lowbies...
 2013-02-19 15:11:27 -08:00
Vincent_Michael
0c16890774 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2013-02-19 18:57:36 +01:00
Shauren
5b414bb813 Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value 2013-02-19 17:35:27 +01:00
Machiavelli
6b63a98ab0 Core/SmartAI: Prevent recursive EnterEvadeMode call 
Ref #8679
 2013-02-19 16:35:26 +01:00
Nay
03f97f75ec Core/Startup: Write current and expected maps version when there's a version mismatch 2013-02-19 01:16:24 +00:00
Nay
037c912bb5 Core/ObjectMgr: Fix a logic error in GetEquipmentInfo 
Thanks @Shauren
 2013-02-19 00:18:00 +00:00
Nay
e7dbb4296c Scripts/Spells: Fix Winter Veil PX-238 
Ref #9238
Thanks @joschiwald
 2013-02-18 22:15:58 +00:00
Vincent_Michael
71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Machiavelli
1c745dfe16 Core/Vehicles: Fix a few issues 
- Fix position desync issue
Closes #9073
- Fix a crash related to passenger's EventProcessor, thanks to Shauren
- Fix crash related to charminfo
- Make compiler happier about certain things
 2013-02-18 16:19:16 +01:00
Spp
4fc7fcae33 Core/RBAC: Add config option to set comma separated list of groups to add by default 
- Allows to reduce the rows in rbac_account_groups
 2013-02-18 14:49:59 +01:00
Nay
028c72a9f2 Core/NPCs: Refactor equipments 
- creature_template.equipment_id deleted
- creature_equip_template.entry == creature_template.entry
- id field added to creature_equip_template -> PK(entry, id)
- id field in creature_equip_template starts at 1
- creature.equipment_id references id of creature_equip_template
- creature.equipment_id = 0 means no equipment at all (default 1)
- creature.equipment_id = -1 means pick a random equipment from creature_equip_template
- add equipment info to .npc info command

While table creature_equip_template got bigger in size, this system is easier to mantain and allows creatures to have a random template from a group of equipments
 2013-02-18 12:24:18 +00:00
Nay
87d4e8c067 Core/Config: Change CONFIG_EVENT_ANNOUNCE from int to bool 
Also correct the description of BeepAtStart, it works in Windows as well
 2013-02-18 12:20:00 +00:00
Shauren
2144f0fd8e Core/Scripts: Correct orders of parameters used in OnGroupChangeLeader script hook 2013-02-18 12:23:46 +01:00
Machiavelli
cc8d5a3aca Core/Vehicles: Prevent infinite loop in VehicleJoinEvent:Abort 2013-02-18 02:20:42 +01:00
Vincent_Michael
9004d39c09 Core: Whitespace cleanup 2013-02-18 00:56:25 +01:00
Machiavelli
01fbbf3b93 Core/Vehicles: Refactor some parts of vehicle system 
- Fix a few crashes:
Closes #9235
- Simplify and get rid of lots of redundant and silly code
- Optimisations in Unit::ChangeSeat
- More documentation
 2013-02-18 00:39:58 +01:00
click
6395c80e86 Buildsystem: Disable building the nonfunctional meshextractor.tool (not in a production-state atm), it CAN however be built with with using the -DWITH_MESHEXTRACTOR flag (not documented as option, and will most probably change in the future) 2013-02-17 20:28:55 +01:00
Nay
f2b48ba008 Merge pull request #9220 from roc13x/master 
Core/Items: Fix logic in Player::AddItem
 2013-02-17 06:32:54 -08:00
Nay
a126259a39 Merge pull request #9234 from ak47sigh/patch-1 
declared WEATHER_STATE_FOG
 2013-02-17 06:32:15 -08:00
Alexei_Nech
d0799f3f88 Update src/server/game/Weather/Weather.cpp 2013-02-17 16:29:24 +02:00
Machiavelli
0049e580eb Core/Auras: Restore part of 1845ab79 that was accidentally reverted 2013-02-17 14:48:14 +01:00
Alexei_Nech
608785c3a4 declared WEATHER_STATE_FOG 2013-02-17 14:08:41 +02:00
Machiavelli
6590cf4f9e Core/Vehicles: Fix another crash 
Don't set Unit::m_vehicle until VehicleJoinEvent::Execute
 2013-02-17 08:03:27 +01:00
Shauren
863468ec43 Core/Auras: Always run all script hooks attached to the aura to prevent leaving aura script state stack in unbalanced state 2013-02-17 02:11:13 +01:00
Shauren
e49aaab6f6 Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line 2013-02-17 02:10:08 +01:00
Nay
2d861b71ce Core/SAI: Add actions to set/add/remove (104/105/106) gameobject flags 2013-02-16 18:42:26 +00:00
Shauren
13b4adc618 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-02-16 19:17:32 +01:00
Shauren
17d0ea6660 Core/Auras: Prevent saving vehicle auras to db for players as they require both caster and target to be in world (which cannot be guaranteed) 2013-02-16 19:16:52 +01:00
Vincent_Michael
6cfb5e13dc Core/Character: Rename engrish function 2013-02-16 18:53:44 +01:00
Vincent_Michael
166a2092fd Scripts/BWL: Fix build no. 2 2013-02-16 18:15:32 +01:00
Nay
f95ce01b15 Scripts/BWL: Fix build 2013-02-16 17:12:10 +00:00
Nay
a614dd775c Say NO to whitespace 2013-02-16 17:04:44 +00:00
Nay
e448d24f2b Merge pull request #9228 from gigatotem/BWLv2 
Scripts/Blackwing Lair: Broodlord Lashlayer clean-up.
 2013-02-16 08:58:26 -08:00
Gigatotem
2e08db9ce9 Scripts/BWL: Fix typo in recent commit. 2013-02-16 16:56:06 +00:00
Gigatotem
920cd0e923 Scripts/Blackwing Lair: Broodlord Lashlayer clean-up. 2013-02-16 16:42:17 +00:00
Machiavelli
35fc90c684 Core/Vehicles: Fix another crash 
Fixes #9225
 2013-02-16 16:12:24 +01:00
Shauren
1845ab7918 Core/Auras: Only auras that are stackable to use the same slot 2013-02-16 15:40:47 +01:00
Machiavelli
8bbcc2f37c Merge pull request #9214 from Aokromes/master 
Scripts/Ulduar: Kologarn's gate should be open while in combat
 2013-02-16 01:08:58 -08:00
Machiavelli
178134d86b Core/Vehicles: Fix crash introduced in my previous change 2013-02-16 09:51:46 +01:00
Vincent_Michael
49e196e6b0 Misc/Spells: 
- Add some ulduar teleport pos for spells
- Add target hack for ulduar teleport spells
 2013-02-16 03:26:26 +01:00
Machiavelli
60cef65b5c Core/Vehicle: Make the passenger join event asynchronous 
Prevents a crash in the following scenario:
Player 1 enters vehicle X
Seat on vehicle X is taken by Player 2
Player 2 is removed from vehicle X
Vehicle X dismisses (but player 1 did not even finish AddPasssenger
call)

Fixes #4271
 2013-02-16 02:11:42 +01:00
Shauren
f74b874e93 Core/Auras: Allow auras that cannot create a separate stack for each caster to stack on one slot 2013-02-15 18:08:15 +01:00
Nay
82ff367be8 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-02-15 17:07:50 +00:00
w1sht0l1v3
1ce1ec0775 Scripts/TheStormPeaks: Cosmetic changes. 2013-02-15 16:36:01 +02:00
w1sht0l1v3
7d881a0739 Scripts/TheStormPeaks: Cold Hearted quest update. 
Fix a crash.Thx @DDuarte.
Closes #8865
Move waypoint data from script  to DB table.
 2013-02-15 15:51:18 +02:00
Vincent_Michael
6beda05e3d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.h
 2013-02-15 14:23:21 +01:00