Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-09 03:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,215 Commits 4 Branches 147 Tags
b1eb4e58fdf38a045fbb734c4e7f45b660e556fc
Commit Graph

6393 Commits

Author SHA1 Message Date
Vincent-Michael
11ad7aac86 Scripts/ZulAman: Fix non pch build and warnings 2013-06-15 00:03:45 +02:00
Vincent-Michael
b3f0d094b1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-14 23:44:46 +02:00
Vincent-Michael
9aea25f06c Scripts/ZulAman: 
- Hard reset for old scripts
- Add pre Event (is not complete)
- Some cleanup
 2013-06-14 23:39:02 +02:00
Malcrom
711809c58c Scripting: Added an overlooked enum. 2013-06-13 17:35:41 -02:30
Malcrom
8031aa4d40 Scripting: Update Lake Frog Script to use Events. 2013-06-13 17:28:43 -02:30
Vincent-Michael
87d9d1d705 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.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_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.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_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/Spells/spell_pet.cpp
	src/server/scripts/Spells/spell_shaman.cpp
 2013-06-13 19:35:01 +02:00
Vincent-Michael
1c9a3d5621 Scripted/Quest: Fix codestyle in 4065a8509f 2013-06-13 18:37:59 +02:00
Malcrom
8fb1e4e06c Scripting: Minor visual script fix. 2013-06-13 12:41:34 -02:30
Trinity
5a7d74ce87 Fix warning 2013-06-13 14:58:07 +02:00
Pitcrawler
ca100a30f0 DB/Quests: Fix Convocation at Zul'Heb, closes #9122 2013-06-13 12:44:07 +02:00
Malcrom
4065a8509f Script: Add scripting for Quest A Blade Fit For A Champion 
Still need pooled spawning for entry 33224. Aokromes has info if someone wants to do it.
 2013-06-13 00:50:21 -02:30
Pitcrawler
2f771d4950 DB/Quests: Fix Badlands Reagent Run II, closes #9880 
Thanks @joschiwald and @Kirkhammett
 2013-06-12 21:15:17 +02:00
Malcrom
4096c54efa Core: More Function name updates 2013-06-11 22:02:00 -02:30
Malcrom
ec474a62e5 Core: More Function Renaming. 2013-06-11 21:25:12 -02:30
Malcrom
66978cfc3b Core: Some function renaming. 2013-06-11 19:54:27 -02:30
Malcrom
047608e7de Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet(). 2013-06-11 18:39:51 -02:30
Vincent-Michael
0bebf40fe7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp
 2013-06-11 22:07:11 +02:00
Shauren
9ec22fffa0 Core/Objects: Object scale will now also affect bounding radius and combat reach fields 2013-06-11 17:28:16 +02:00
w1sht0l1v3
5f33bfb925 Core/Scripts: Fix Drake Hunt, closes #2005 2013-06-09 22:14:20 +03:00
Pitcrawler
fb28dcb3c4 DB/Quests: Fix The Explorer's League Outpost 
Move a corescript to SAI
 2013-06-09 18:10:03 +02:00
Pitcrawler
368e3c17a1 Core/Scripts: Simplify spellscript from 1f785905d5 2013-06-08 19:30:40 +02:00
Pitcrawler
1f785905d5 DB/Quests: Fix Danger! Explosives!, closes #6850 closes #9458 2013-06-08 16:21:24 +02:00
Malcrom
a8d1fafa0a Scripting: fix gossip scripting for rogue trainers 2013-06-03 23:31:20 -02:30
Vincent-Michael
872c0c9c73 Core Whitespace cleanup 2013-06-03 20:37:59 +02:00
Vincent-Michael
efb4fb4959 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2013-06-03 18:19:18 +02:00
Vincent-Michael
f6c1a9a8c4 Core: Fix warning 2013-06-03 18:04:42 +02:00
Subv
1d1bb84cf9 Merge pull request #9854 from Ascathor/master 
Core/Command: Optimized .pinfo more
 2013-06-02 17:52:27 -07:00
Vincent-Michael
216827201e Script/Ulduar: Fix try for Assembly Of Iron achievement "I choose you, xxx" 2013-06-02 23:16:18 +02:00
Shauren
1866c7a038 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-06-01 18:34:58 +02:00
Shauren
fb718d20aa Core/Scripts: Always run OnSpellClick AI hook, even if there are no spells defined for spellclick event. 2013-06-01 18:30:36 +02:00
Shauren
7d64b56db1 Core/PacketIO: Fixed SMSG_PLAY_SOUND structure 2013-06-01 17:49:33 +02:00
Shauren
feb5ade2d7 Scripts/Icecrown Citadel: Fixed SMSG_PLAY_MUSIC structure used in The Lich King encounter 2013-05-31 22:22:20 +02:00
Shauren
a50eec9439 Fixed merge errors 2013-05-30 21:23:11 +02:00
Shauren
adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
 2013-05-30 20:57:07 +02:00
Spp
9664c0ab5c Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-30 13:18:29 +02:00
Shauren
80226fb38f Scripts/Halls of Reflection: Fixed a possible crash 2013-05-28 15:18:37 +02:00
Pitcrawler
379d41735c DB/Quests: Fix some remaining issues from aaa1d9b749 
For example the missing floating visual and prevent the script from being started more than once.
 2013-05-27 14:29:46 +02:00
Gacko
583d865c24 Script/Gundrak: Codestyle 2013-05-26 21:58:03 +02:00
Ascathor
fb52e9ea03 Core/Command: Optimized .pinfo more 
* Moved some checks around
* Added RBAC Permission for Email, last login and last ip (group 3 and 4) -- If missing RBAC permission, then it displays "Unauthorized (RBAC)"
* Changed totalmail output from uint64 to uint32
* Level either puts Max level, or a list of information necessary
* Only queries guild if the current xp query also detects guild membership
* Incorporated recent changes into code
* Commander requires higher than target to get sensitive data beside RBAC permission.
 2013-05-26 14:21:39 +02:00
Shocker
dc81fa0d57 CMake: Include AreaTrigger directory in CMake files 2013-05-26 05:07:49 +03:00
xjose93
5a7cebe114 Scripts/Gundrak: Fix Gal'darah door. 2013-05-24 22:27:34 +02:00
Shauren
b688fc0ed5 Compile fix 2013-05-24 20:36:29 +02:00
Shauren
b8d75db4f1 Scripts/Halls of Reflection: Fixed gauntlet event 2013-05-24 20:06:58 +02:00
Shauren
bda68d3f9d Core/Commands: Fixed wrong field types used in db queries for pinfo command and output alive state if target is offline 2013-05-24 18:31:19 +02:00
Shauren
fd0397cbd2 Scripts/Halls of Reflection: Fixed a few possible crashes and cleaned up the code a bit 2013-05-24 18:03:07 +02:00
Vincent-Michael
a00d61485c Core: Fix warnings 2013-05-24 17:39:30 +02:00
Vincent-Michael
76e7ba886b Core: Fix logic fail in 77743ea13e 2013-05-24 17:28:17 +02:00
Vincent-Michael
77743ea13e Core: Fix non pch build 2013-05-24 17:12:06 +02:00
Aokromes
1136d90bac Scripts/Halls of Reflection: Falric/Marwyn 
This is a Work in Progress script by WishToDie based on the work found at http://www.trinitycore.org/f/topic/7192-patch-halls-of-reflections/
 2013-05-24 10:09:00 +02:00
Shocker
03aa05a799 Actually fix compile 
(sorry about the multitude of commits)
 2013-05-22 02:26:21 +03:00