Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,619 Commits 4 Branches 146 Tags
d5eeeb11d36d29d4fbd9755901510f57aa6483ea
Commit Graph

19619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent_Michael
d5eeeb11d3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-23 23:53:23 +01:00
Shauren
b1d43f837a Core/Vehicles: Fixed crash in RemovePendingEventsForSeat - changed _pendingJoinEvents container from deque to list as deque invalidates all iterators pointing to the container (including .end()) when performing erase 2013-02-23 19:24:59 +01:00
Spp
49b609d2e4 Core/Calendar: Fix mem leak and minor cosmetic changes 2013-02-23 19:18:09 +01:00
Spp
22353a012f Core/RBAC: Fix mem leak 2013-02-23 19:18:09 +01:00
Vincent_Michael
56e32aac82 SQL: Fix "No newline at end of file" in 194cc54f08 2013-02-23 18:15:49 +01:00
Vincent_Michael
194cc54f08 DB/Gameobject: Removed transport gameobject 2013-02-23 18:13:17 +01:00
Shauren
daced24223 Core/Vehicles: Really make RemovePendingEventsForSeat iterating crash safe 2013-02-23 16:05:08 +01:00
Machiavelli
7cab6d308a Core/Vehicles: Make RemovePendingEventsForSeat iterating crashsafe 2013-02-23 15:25:47 +01:00
Machiavelli
b91c33dca5 Core/Vehicles: Fix a crash in VehicleJoinEvent::Execute 
Crash would happen if multiple events were scheduled for the same seat.
Fixes #9255
 2013-02-23 15:12:39 +01:00
Vincent_Michael
2672d13443 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-22 23:10:30 +01:00
Shauren
729a37363b Core/Vehicles: Corrected logging message format specifiers 2013-02-22 18:01:57 +01:00
Shauren
ae8e423c73 Core/Vehicles: Minor cleanup in header file 2013-02-22 17:46:57 +01:00
Shauren
2f0bbe67ae Core/Vehicles: Fixed accessing freed memory in Vehicle::RemoveAllPassengers - _pendingJoinEvents needs to be cleaned from events that had already executed or were aborted 2013-02-22 17:46:29 +01:00
Shauren
0ef974a9de Core/Creatures: Set hover movement flag if bytes1 have hover flag and creature cannot fly 2013-02-22 01:21:49 +01:00
Vincent_Michael
7d37629c17 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-21 17:10:33 +01:00
Machiavelli
5143804014 Core/Vehicles: Also remove mount auras for passengers not in charm seat 
May fix related crashes:
Ref #9256 #9255
 2013-02-21 14:43:31 +01:00
Spp
7d3fa71a03 Core/Misc: Remove devel log msg that shouldn't have been commited 2013-02-21 01:16:22 +01:00
Spp
fd882a4e61 Core/Logging: Fix mem leak. Thanks to @Sar777 for the report 2013-02-21 01:10:58 +01:00
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
Trista
2484e5760a DB/SAI: Add sai for quest Gather the Orbs (10859) 
Closes #7636
 2013-02-19 21:53:30 +01:00
ZxBiohazardZx
bd01370dff DB/Conditions: add conditions to Lokhtos Darkbargainer Thx badmoon for initial fix 
Closes #9028
 2013-02-19 21:50:55 +01:00
Vincent_Michael
1df992e918 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-19 21:50:40 +01:00
Exodius
e7a5c7e69b DB/Creature: Set Triggerflags & behaviour to triggerNPC 
Closes #8950
 2013-02-19 21:23:00 +01:00
Larya
5c4d2d3b63 DB/Creatures: Update damage done by ICC bosses to more blizzlike values 
Closes #8580
 2013-02-19 21:20:56 +01: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
Kinzcool
12e5541636 DB/Spell: Added an auto-kill spell if you go at No Man's Land in Isle of Conquest 2013-02-18 23:09:53 -05: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
Nay
0d5dece43a Merge pull request #9244 from Ascathor/master 
SQL Fix after 933381f
 2013-02-18 14:14:02 -08:00
Ascathor
8027c956fc SQL Fix after 933381f 2013-02-18 22:56:54 +01:00
Pitcrawler
933381f80d DB/Misc: Mostly gossip stuff for various creatures. 
Some scripts still need to be implemented.
Fixes quest Blood Oath of the Horde.
 2013-02-18 19:56:35 +01: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
Nay
fab33f0774 SQLs: Rename some old SQL files to match standards 2013-02-17 21:11:45 +00: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