kaelima
3d14384c32
Merge git://github.com/TrinityCore/TrinityCore into 4.x
...
Conflicts:
dep/PackageList.txt
sql/base/auth_database.sql
src/server/authserver/Server/AuthSocket.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Chat/Commands/Level1.cpp
src/server/game/Chat/Commands/Level3.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Updates/UpdateData.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Loot/LootMgr.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/Spell.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/scripts/Commands/cs_gps.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Logging/Log.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/CMakeLists.txt
2012-05-30 08:01:02 +02:00
Spp
5cff9e0716
Merge branch 'master' into 4.x
...
Conflicts:
sql/base/auth_database.sql
src/server/authserver/Server/AuthSocket.cpp
src/server/game/AI/CoreAI/CombatAI.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Logging/Log.h
src/server/worldserver/worldserver.conf.dist
src/tools/vmap3_extractor/model.h
src/tools/vmap4_extractor/CMakeLists.txt
src/tools/vmap4_extractor/dbcfile.cpp
src/tools/vmap4_extractor/dbcfile.h
src/tools/vmap4_extractor/loadlib/loadlib.h
2012-02-23 13:06:35 +01:00
click
dce3bc01ac
Core: Fix non-PCH building
2012-02-19 16:57:07 +01:00
click
5411e1ce52
Core: Clean up whitespace and tabs in the base sourcetree
2012-02-18 16:52:08 +01:00
Kandera
c517806a23
Scripts/Spells: Convert code from Spell::EffectDummy to spell scripts.
2012-02-18 12:12:49 +01:00
Spp
03c34ee507
Fix a lot of warnings
2012-02-16 13:56:28 +01:00
Subv
9791bb599a
Merge pull request #5160 from TrinityCore/dynamic_vmaps
...
Added Dynamic Vmaps, RE-EXTRACT YOUR VMAPS
2012-02-09 11:17:05 -08:00
Subv2112
93d199f043
Core/Collision: Ported dynamic line of sight patch by Silverice from MaNGOS and
...
added lots of improvements
Please re-extract vmaps
2012-02-09 13:58:22 -05:00
Matthew Goff
7a117dd429
Core/Misc:
...
- Replace emote magic number by enum
- Added all missing defines from AnimationData.dbc. Minor corrections to existing ones. Standardized some naming and updated cpp files as needed.
- Correct a spell used in AQ
Closes #3787
Closes #5095
2012-02-06 01:22:45 +00:00
QAston
c7ea952a47
Core/Entities: Rename UNIT_FLAG_OOC_NOT_ATTACKABLE and UNIT_FLAG_PASSIVE to UNIT_FLAG_IMMUNE_TO_PC and UNIT_FLAG_IMMUNE_TO_NPC respectively. New names tell much more about what those flags do.
2012-02-03 18:46:05 +01:00
Shocker
04f38855ab
Core/Misc: Rename UNIT_STAT_* enums to UNIT_STATE_*
2012-02-03 19:12:41 +02:00
Shocker
08be716ef8
Core/Misc: Rename UNIT_STAT_* enums to UNIT_STATE_*
2012-02-03 19:02:17 +02:00
Spp
37b66384f3
Merge branch 'master' into 4.x
...
Conflicts:
src/server/authserver/Server/AuthSocket.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
2012-01-31 11:49:53 +01:00
click
e6d5b21778
Core: Fix non-PCH build and remove a few warnings.
2012-01-24 00:24:39 +01:00
Machiavelli
dbbac0bdaa
Core/Movement: Implement spline movement subsystem.
...
Spline movement controls movements of server-side controlled units (monster movement, taxi movement, etc).
Proper implementation of effects such as charge, jump, cyclic movement will rely on it.
However, need improve our states system before.
Technical changes:
* Added linear, catmullrom and bezier3 splines which based on client's algorthims. They can be reused for proper transport position interpolation.
* Precission increased. There are no more position desync issues since client's position calculation formulas used.
* Now possible to move by paths with multiple points, send whole path to client.
--
Original author of research and implementation: SilverIce. Massive kudos.
Original port for Trinity (ref #4629 ) Chaplain and Venugh
With the following incremental fixes during my review:
- Restore flightmaster end grid pre-loading
- Fix uninitialized Creature::m_path_id
- Add missing trinity_string entries for .movegens command
- Fix a bug in WaypointMovementGenerator that would trigger unexpected pausing at waypoints for various amounts of time
Known issues:
- Errors like WaypointMovementGenerator::LoadPath creature XXX (Entry: YYYYY GUID: ZZZZZZ) doesn't have waypoint path id: 0.
This is caused by bad DB data. This commit didn't "break" it.
Do not forget to re-run CMake before compiling.
2012-01-14 15:36:07 +01:00
Venugh
b242a19ad5
Core/Scripts: remove define from arcatraz.
2012-01-13 22:02:04 +01:00
Venugh
d359c87908
Core/Scripts: Convert Warden Mellichar texts to creature_texts.
2012-01-13 21:59:21 +01:00
Venugh
e6b159f7ea
Core/Scripts: Correct rand change. thanks to Nayd for explain.
2012-01-13 21:41:45 +01:00
Venugh
6929fff8d6
Core/Scripts: Convert MillHouse Manastorm texts to creature_texts.
2012-01-13 21:13:18 +01:00
kaelima
233d891952
Scripts/Achievements:
...
- Move achievement Shocking! to appropriate boss script instead of instance script.
- Split the polarity spellscript into two and move to proper boss file
- Fixed a typo in Loatheb's spore achievement.
2012-01-11 17:21:03 +01:00
Nay
9c26ce8da5
Merge branch 'master' into 4.x
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Quests/QuestDef.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
2012-01-07 17:13:42 +00:00
Souler
2d8a6fdf15
Scripts/Quests: An Apexis Relic, The Relic's Emanation and Guardian of the Monument.
2012-01-06 01:19:07 +01:00
kiper
8299627ed9
Update headers for 2012. HAPPY NEW YEAR!!!
2012-01-01 00:32:13 +01:00
Spp
3792b470e0
Core/Scripts: Replace rand with urand in most cases (using regexp)
...
Used: perl -pi -e 's/([0-9]+) \+ rand\(\)\%([0-9]+)/"urand(".$1.", ".($1+$2).")"/ge'
2011-12-28 10:51:16 +01:00
Spp
996364752c
Core/Scripts: Replace rand with urand in most cases (using regexp)
...
Used: perl -pi -e 's/([0-9]+) \+ rand\(\)\%([0-9]+)/"urand(".$1.", ".($1+$2).")"/ge'
2011-12-28 10:42:43 +01:00
Spp
fa9daaf95b
Merge branch 'master' into 4.x and some warning fixes
2011-12-27 10:15:27 +01:00
Discover-
9b8d18e7cd
Scripts/Quests: Add a double check in summoning for two of my previous scripts, as well as revert changing WDB data.
2011-12-25 17:17:28 +01:00
Discover-
dbcccbbb44
Core/Quests: Add script for quest The Thunderspike.
...
Closes #4458 .
2011-12-25 16:44:55 +01:00
Discover-
275aa8a7d8
DB/Miscellaneous: Implement humans transforming into worgens at night inside Pyrewood Village.
...
And yet again some silly typo's, sorry guys.
Closes #3062
2011-12-25 01:21:09 +01:00
Discover-
49e10f992a
Scripts/Quests: Zuhuled the Wacked
...
And obviously, some typo's.
Closes #3704
2011-12-25 00:52:01 +01:00
Discover-
c3e527da6d
Core/Quests: Script quest Captain Tyralius.
...
Closes #3091 .
2011-12-25 00:36:17 +01:00
Nay
9f635ca906
Merge branch 'master' into 4.x
2011-12-18 15:10:54 +00:00
Spp
d59c5e627f
Fix warnings
2011-12-15 11:12:15 +01:00
Machiavelli
b1c8226d58
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2011-12-10 15:21:55 +01:00
Aokromes
d95a0aee76
Add missing %s to 2 emotes.
2011-12-09 20:54:20 +01:00
Rat
5d39e09d89
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2011-11-23 20:23:26 +01:00
Rat
47d0a7f3af
Merge branch 'master' of github.com:TrinityCore/TrinityCore
...
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCfmt.h
src/server/game/Server/Protocol/Opcodes.cpp
2011-11-23 20:23:04 +01:00
Shauren
358b33239a
Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit
2011-11-23 19:17:33 +01:00
Shauren
638693e78f
Core: Fixed more warnings (C6246: Local declaration of 'x' hides declaration of the same name in outer scope.)
2011-11-23 17:55:16 +01:00
Rat
d1affc4340
Initial Commit for client version change to 4.2.2 (14545)
...
- added known opcodes (handlers are commented till not updated)
- added bitstream support to bytebuffer
- updated realm auth for 14545
- updated world auth
- fixed char_enum,create,delete handlers
- added DB2 reader
- added opcode logging to debuglogmask (ignores loglevel)
- fixed compile in win64, others not yet tested
- using db2 values for item models at char_enum to prevent client crash
Lots of Thanks to All SingularityCore Members
2011-11-20 18:28:18 +01:00
Bootz
d1334624da
Core: Codestyle clean-up
...
"pl"->"player"
Note: codestyle methods needs maintained, Player* player.
still to do properly clean-up chat.cpp.
2011-11-07 11:18:00 -06:00
Discover-
80720358f0
Scripts/Nagrand: Fix creature text of Maghar Prisoner and remove useless RAND() in go_warmaul_prison.
2011-10-25 23:52:55 +01:00
Discover-
fe3f19148a
DB/SAI: Convert quests Survey the Land & Illidan's Pupil from core scripts to SAI (and fix them properly)
...
Closes #3060
2011-10-23 11:10:58 +01:00
Nay
8e2440133e
DB/SAI: Convert quests 10987, 10107, 10108, 9918, 9849 from core scripts to SAI
...
Closes #1544
Closes #3055
Closes #3056
Closes #3058
Closes #3059
2011-10-23 11:00:56 +01:00
Discover-
fc174912f4
DB/Conditions: Fix quest Returning the Favor
...
Closes #3035
Also fix build (not enough Ctrl+S)
2011-10-22 17:48:09 +01:00
Nay
26b3e62b26
Scripts/Nagrand: Add a quest incomplete check in go_warmaul_prison (previous commit).
...
Thanks @Retriman
2011-10-22 17:38:26 +01:00
Discover-
8cc6750388
Scripts/Nagrand: Fix quest Finding The Survivors
...
Closes #442
Closes #3033
2011-10-22 17:33:12 +01:00
Discover-
6e1107f5fc
Scripts/Nagrand: Fix quest Totem of Kar'dash
...
Closes #3032
2011-10-22 17:30:53 +01:00
Fredi Machado
97142102e0
Core/Misc: Added 'f' after float values
2011-10-17 07:38:27 -03:00
Nay
521c3fc656
Core/Scripts: Fix Build.
...
Closes #3500
Closes #3503
Thanks @raelik
2011-10-14 10:16:20 +01:00