Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
23,857 Commits 2 Branches 1 Tag
a9d00b9c969f2e0297bf2500fdf78bc05fe4011e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DDuarte a9d00b9c96 TDB 335.59 - 2015/07/14 2015-07-14 01:24:35 +01:00
DDuarte 5b078786a2 Update .gitattributes to prevent CRLF issues 2015-07-10 20:32:59 +01:00
DDuarte 57091cc5f1 CRLF to LF 
Seriously....
 2015-07-10 20:16:55 +01:00
DDuarte be32beee57 Core/Executables: Add --version and -v to worldserver and authserver arguments 
Closes #14993

(cherry picked from commit 0f082e8f925f17e585fd221b901f55581d2d68ab)

Conflicts:
	src/server/bnetserver/Main.cpp
 2015-07-04 02:54:23 +01:00
DDuarte 5e9a21291c Buildsystem: Fixed disabling compiler warnings in dep for clang/icc 
(cherry picked from commit c24787f6665b5ea2b696bdfa7134a19ab5a3c331)

(reverts 77f7f56268)

Conflicts:
	dep/CascLib/CMakeLists.txt
	dep/zmqpp/CMakeLists.txt
 2015-07-04 01:56:10 +01:00
DDuarte dfc71765f8 Core/ObjectMgr: Fix 3 -Wunused-private-field warnings in TempSummonGroupKey 
Replace a memcmp by a lexicographical comparison with std::tie

(cherry picked from commit 1df20a2134dbb84d1eb30024171ccd7e8b103e47)
 2015-07-04 01:50:35 +01:00
DDuarte 1b2a67a1b5 Build/CMake: Fix finding MySQL install 
(cherry picked from commit d4deb17a2f94d06b7eab232b90e874fa58675b36)
 2015-06-29 14:09:48 +01:00
DDuarte 5a7adbba3a Fix build after recent cherry picks (v2.0) 2015-06-26 04:08:40 +01:00
DDuarte 079ebe4d5d Fix build after recent cherry picks 2015-06-26 04:01:26 +01:00
DDuarte 02df39f791 Fix build and SQL import after recent cherry picks 2015-06-26 02:42:24 +01:00
Duarte Duarte 33f48a460c Merge pull request #14920 from Exodius/Exodius-readme 
Update README.md
(cherry picked from commit 4093eee19b511864f1049c8d2e9c34ab897f619c)
 2015-06-26 01:28:40 +01:00
DDuarte 24b5dfcb4d Core/BattlegroundIC: Removed 1 hack: 
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."

(cherry picked from commit 8a4afad63ac97b39f6746d466f3166eeef62e711)

Conflicts:
	sql/updates/world/2015_05_01_00_world.sql
	src/server/game/Miscellaneous/Language.h

Rename 2015_05_01_00_world.sql to 2015_06_13_00_world.sql

(cherry picked from commit 74eeefa5be163a55489f91c05d7dfd1cb624c78d)
 2015-06-26 01:24:21 +01:00
Duarte Duarte a8d8976e2c Merge pull request #14723 from TrinityCore/findmysql-update 
Update FindMySQL.cmake
(cherry picked from commit fb4a9823c41b31158f6b5d68fc2ffc1608051984)
 2015-06-26 00:52:52 +01:00
DDuarte 80695181b9 Core/LootMgr: Remove dead validation code from LoadLootTable 
CID 1288389 Operands don't affect result

(cherry picked from commit 47a119e4fa617319b283e7c3824241bc0b6775fb)
 2015-06-26 00:51:16 +01:00
DDuarte ae64c11b28 Core: Fix multiple Coverity issues 
(cherry picked from commit b8c681c776d7918e7b3f2a89422509a87bcb5da2)

Conflicts:
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Server/Packets/CharacterPackets.h
	src/server/game/Server/Packets/MovementPackets.h
	src/server/game/Spells/SpellInfo.cpp
 2015-06-26 00:49:38 +01:00
DDuarte 08b8dd10d1 Core/GOs: Correct type of lowGuid when loading gameobject_addons 
Coverity IDs: 1302436 1302437 1302438

Issue introduced in 95b5e35745
 2015-06-01 02:09:45 +01:00
DDuarte 1e54097084 Core/Scripts: Corrected argument types in GetCreatureEntry/GetGameObjectEntry ZoneScript hooks 
(cherry picked from commit b0c4268a6b0ed1fffeb51c7542c7991399b18284)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp
 2015-06-01 00:44:11 +01:00
Duarte Duarte be2fb616c7 Update worldserver.conf.dist 
Fix typo in ClientCacheVersion
(cherry picked from commit fc85f0e30fed383515f3d519dcef2cb87e3ee854)
 2015-06-01 00:34:38 +01:00
DDuarte cb9ef69732 Core/Movement: Fix a typo in FlightPathMovementGenerator::InitEndGridInfo() 
Added in 916ce6f4f3
Thanks @Rochet2 for finding it
 2015-05-24 14:52:20 +01:00
Duarte Duarte 90e2b7266b Merge pull request #14674 from jaredjones/patch-1 
CMake OS X: Fixed Debug Mode for Xcode
(cherry picked from commit b96e70af71a1cc87a33a79c71618697cd8f7ca9f)
 2015-05-19 19:29:01 +01:00
Duarte Duarte f4c1a8fb2d Merge pull request #14454 from ariel-/cd 
Port Core/Spells: Cooldown updates (6.x branch)
 2015-05-19 18:52:05 +01:00
DDuarte 916ce6f4f3 Fix build after recent cherry-picks 
- Rename fields in TaxiPathNodeEntry to match 6.x names
- Add LowType to ObjectGuid
 2015-05-19 12:30:06 +01:00
Duarte Duarte c9e699961e Merge pull request #14540 from tkrokli/npc_mootoo_the_younger 
Fix $n bug in NPC text for quest 11664 Escaping the Mist
 2015-04-12 14:29:48 +01:00
Duarte Duarte 13293f8887 Merge pull request #14511 from Exodius/thunderspike 
Core/Scripts: Remove The Thunderspike script
 2015-04-06 20:14:16 +01:00
DDuarte 606c443cb0 Revert "Merge pull request #14424 from Rushor/Rampart" 
This reverts commit 22c0007b42, reversing
changes made to 20bc2c51f6.
 2015-04-03 20:59:15 +01:00
Duarte Duarte 20bc2c51f6 Merge pull request #14083 from Gooyeth/3.3.5_sample_satisfaction 
Core/Spells: Fixed Sample satisfaction not entering combat
 2015-04-03 18:32:02 +01:00
Duarte Duarte 965ed68470 Merge pull request #14426 from tkrokli/SetQuestSlotState 
[Core/Quest] Update quest Objective status Client side
 2015-03-22 22:12:02 +00:00
Nayd 2774d03be0 Update world_database.sql 2015-03-22 20:02:52 +00:00
Nayd 922be41916 SQLs: Re-add two sql files (236e43443c & 0f6515750d) 2015-03-21 22:16:03 +00:00
Nayd 360075129e TDB 335.58 - 2015/03/21 2015-03-21 22:06:46 +00:00
Nayd c9fa26f731 Rename SQL files 
Preparations for TDB release
 2015-03-21 21:12:58 +00:00
Nayd 2ac40775a2 Core/Spells: Implement HasAttribute() helper for SpellInfo for easier readability 
Original code by @Shocker (6.x branch)
 2015-03-18 23:16:39 +00:00
Duarte Duarte 769acfbd02 Merge pull request #14370 from Kittnz/realm_achievement 
Core/Condition: Realm Achievement condition
 2015-03-17 12:42:35 +00:00
Nayd 0ebc15e6f4 Core/DBLayer: Remove references to table character_currency (6.x only) 
Ref 170bc318b3
 2015-03-15 15:50:05 +00:00
Nayd dbcfa3b120 SpellAuras.cpp: typo fix 2015-03-15 14:09:00 +00:00
Duarte Duarte 2fe8885463 Core/Spells: Fix a float division issue in EffectLeapBack 
Ref Coverity CID 1227511

(cherry picked from commit 709275eecbbe073cd9b9170debfcef476ef66a6c)

Conflicts:
	src/server/game/Spells/SpellEffects.cpp
 2015-02-22 06:10:16 +00:00
Duarte Duarte 958999ff5c Core/Server: Catch exceptions in int main() 
The exceptions is rethrown on debug mode.

Ref Coverity CID 1010213, 1022574, 1227501, 1227502,
1227503, 1227504, 1227505, 1254536 and 1254612

(cherry picked from commit e68ca82d4d039a401d03de145111b0a738bb9dd7)

Conflicts:
	src/server/bnetserver/Main.cpp
 2015-02-22 06:09:01 +00:00
Duarte Duarte a6505dd46a Merge pull request #14103 from Epicurus4/6.x 
Added a player searcher
(cherry picked from commit b7052d2ed735dca233b91c32f762b4156543aa97)
 2015-02-22 05:51:26 +00:00
Duarte Duarte a3bc75b7b9 Merge pull request #14098 from ariel-/arenacd 
Arena Spells Reset Cooldown micro correction
 2015-02-11 18:40:03 +00:00
Duarte Duarte f961c06612 Merge pull request #14106 from Noeliel/3.3.5 
Scripts/ScarletEnclave: Add missing WorldObject parameter for Talk() ove...
 2015-02-11 15:18:28 +00:00
Duarte Duarte 1d627ca1ea Merge pull request #13963 from tkrokli/3.3.5 
Fix Cooldown for Raise Dead (Ghoul)
 2015-02-11 15:17:01 +00:00
Nayd c66bd709f1 Fix build 2015-02-04 19:44:34 +00:00
Duarte Duarte 8b50c142cb Merge pull request #14007 from Rushor/AOESpells 
Game/Spells: 'AoD Specials' should only target one Unit
 2015-02-02 19:40:24 +00:00
Nayd 81ea9f5aa0 Core/Build: Use std namespace in getline calls 
(cherry picked from commit 86f7f47b58e4e044cd9a9171d83863dd8f99d91c)
 2015-02-02 01:58:01 +00:00
Duarte Duarte e9eba6e81f Merge pull request #14002 from Rushor/Webbs 
Scripts/Bloodmyst Isle: Disable CreatureAttack for NPC: Webbed Creature
 2015-02-01 00:14:08 +00:00
Duarte Duarte 984877d6ea Update README.md 
Add labels for how long in average it takes for an issue or PR to be merged.

http://www.issuestats.com/github/TrinityCore/TrinityCore
(cherry picked from commit d874bf0c740af000475ed5b5c7b44d879196fe3e)
 2015-01-31 20:14:51 +00:00
Nayd c87de730fa Core/Quests: Fixed WPE exploit that allowed to accept any quest 
(cherry picked from commit 6b10271891d2cbafbad1446051fcf3866ea728e3)
 2015-01-31 20:12:57 +00:00
Duarte Duarte 61eb65b073 Merge pull request #13996 from Rushor/GymerGO 
Scripts/Zul'Drak: GO Scourge Enclosure - Delay Despawn of Dummy to ensure Explosion
 2015-01-31 20:01:45 +00:00
Duarte Duarte ed158c9c1b Merge pull request #13893 from Unholychick/3.3.5 
Core/Spells: Use BonusAmount for periodic damage
 2015-01-26 19:01:16 +00:00
Nayd 2ed0af7d75 Fix typo in CMakeLists.txt 2015-01-25 15:26:30 +00:00
Nayd 48f6e341d5 Tools: Remove mesh_extractor 
mesh_extractor is not ready for production and it will be developed
in a different branch

(cherry picked from commit a87442be68da4e2ea51a10e3bd8a07ef7b9765b2)

Conflicts:
	src/tools/mesh_extractor/ContinentBuilder.h
	src/tools/mesh_extractor/DBC.cpp
 2015-01-25 15:22:33 +00:00
Nayd 3ea97450ae Update README.md 
Dead links for installation.
(cherry picked from commit ac67f276ceaa517801b6abc9f0edc30d7e8ce604)

Closes #13858
 2015-01-05 16:13:24 +00:00
Duarte Duarte cd0ad4739c Merge pull request #13796 from Unholychick/3.3.5 
Scripts/Spells: Move death grip from DB
 2014-12-28 19:36:21 +00:00
Duarte Duarte 94bfeb8e6b Merge pull request #13794 from Gooyeth/3.3.5_dk 
Scripts/Spells: Adding overrides Death Grip Initial.
 2014-12-28 18:26:45 +00:00
Nayd 81a0e68c9f Core/Spells: Remove a not-required spell dbc correction (b0b7a55bdb) 2014-12-28 17:08:32 +00:00
Duarte Duarte 32d9a71a42 Merge pull request #13547 from heihachi/master 
Core/Player: Fix Restes/RaF exp on the exp bar and from kills
 2014-12-28 15:57:28 +00:00
Duarte Duarte 3cb6ac02b2 Merge pull request #13749 from mthsena/3.3.5 
Core/PetitionsHandler: Move charter costs to config
 2014-12-25 20:53:35 +00:00
Nayd cc9a58eabe Dep/zlib: Update zlib from version 1.2.7 to 1.2.8 
"Version 1.2.8 fixes a very rare bug in decompression. All users are encouraged to upgrade immediately. Version 1.2.8 also has these improvements:
Add new inflateGetDictionary() function
Fix bug where gzopen() immediately followed by gzclose() would write an empty file instead of an empty gzip stream.
Fix bug in gzclose() when gzwrite() runs out of memory"

(cherry picked from commit 09f57db03d352a12d18d06a9c1616045f233dc4d)
 2014-12-24 17:46:52 +00:00
Nayd f9513c8b2e Core/Scripts: Fix build 
Closes #13636
 2014-11-27 12:59:03 +00:00
Duarte Duarte a84216a933 README: Update 3.3.5 build status badge 
(cherry picked from commit 708e36c920cb337eb39b020937d417b02a37d4a8)

Conflicts:
	README.md
 2014-11-26 19:53:13 +00:00
Nayd 24c173f387 Core: Use the correct function to convert strings to unsigned longs and unsigned long longs 
Fixes wrong data being inserted into the database (i.e explored zones).
More info in #13493

Fixes #13493

Thanks to @jackpoz for finding the code issue and @Vavehl for an expectional bug report.

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
 2014-11-26 02:21:50 +00:00
Nayd d8ec7011b6 CMake/FindBoost: Fix policy CMP0054 warning (added in 3.1) 
(cherry picked from commit 7e6dadfea68836cc92aaa7e1bb770be620225aa2)
 2014-11-16 21:45:51 +00:00
Nayd 1119558b9e Core/Networking: Catch possible boost exception in StartNetwork 
Closes #13557

(cherry picked from commit 3eb120ab507aa65e452d21a63ff500254129c262)
 2014-11-16 20:10:23 +00:00
Duarte Duarte 64e34cdec8 Merge pull request #13432 from bloerwald/fix_compiler_detection_on_unix 
cmake: platform: also detect clang by C_COMPILER_ID: C_COMPILER may vary
(cherry picked from commit 774e22ec4a8859664ace0a532c2ab4ae220e5cc9)
 2014-11-02 18:50:11 +01:00
DDuarte 9ad5dce64c SQL: Update /dev/world_database.sql 2014-10-30 13:29:33 +00:00
DDuarte 5474ed1882 TDB 335.57 - 2014/10/20 2014-10-19 03:40:47 +01:00
Duarte Duarte 996ad78122 Merge pull request #13353 from ShinDarth/335_quest_tracker 
Core/Quest: implement Quest Tracker
 2014-10-18 18:57:30 +01:00
Duarte Duarte 2523b47619 Merge pull request #13313 from ShinDarth/335_fix 
Improve logs of missing *_loot_templates
 2014-10-17 23:38:23 +01:00
Duarte Duarte ef7d59964d Readme: Small restyle to Bountysource badge 
See http://www.trinitycore.org/f/topic/10564-bountysource-get-paid-for-fixes/
 2014-10-14 15:20:20 +01:00
DDuarte 103fd9cb63 Scripts/GO: Remove go_field_repair_bot_74A 
Replaced by SAI in c05a4189e2
 2014-10-11 20:40:48 +01:00
Duarte Duarte 611f7749a2 Merge pull request #13307 from beach-creature/master 
Adjust random movement wait time and implement variable wait times
 2014-10-11 18:58:17 +01:00
Duarte Duarte caf81f36e2 Merge pull request #13291 from Unholychick/patch-1 
Core/SmartScripts: Fix multiple target_types
 2014-10-08 23:31:39 +01:00
Duarte Duarte 64e4b507fa Merge pull request #13259 from sonic3000/master 
Core/Scripts: Fix for issue #882
 2014-10-03 16:47:53 +01:00
Duarte Duarte 1854eafcb6 Merge pull request #13140 from Unholychick/preventfleeing 
Core/Mechanics: Fix prevent fleeing + fear
 2014-09-27 21:40:41 +01:00
Duarte Duarte 6042dc810b Merge pull request #13214 from mik1893/achievement 
Core/Achievements: fix old typo in AchievementMgr::SendCriteriaUpdate
 2014-09-25 13:26:31 +01:00
DDuarte d33c2952ad SQLs: Rename updates/world sql files to the new format 2014-09-21 16:26:20 +01:00
DDuarte eeaf7ef6fa Revert "SQL: Update dev/world_database.sql" 
This reverts commit 09f9f3b6b1.

I forgot that world_database.sql should only get updated in TDB releases.
 2014-09-19 18:42:09 +01:00
DDuarte 09f9f3b6b1 SQL: Update dev/world_database.sql 2014-09-19 18:18:18 +01:00
Duarte Duarte bbd38753f8 Merge pull request #13170 from xjose93/BaninfoCharacter 
Core/Commands: Fix displaying in .baninfo character command.
 2014-09-19 18:16:51 +01:00
DDuarte c678eaa71e Core/MapScripts: Use proper enum value for boss whisper in SCRIPT_COMMAND_TALK 2014-09-19 15:19:53 +01:00
DDuarte 878b7d3811 Core/MapScripts: Use proper source unit in SCRIPT_COMMAND_TALK 
Closes #13161
 2014-09-19 15:04:24 +01:00
DDuarte 256ad379dd Oops. 2014-09-19 03:39:57 +01:00
DDuarte cefcde9ba9 Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code) 2014-09-19 03:30:02 +01:00
Duarte Duarte 048e043d0d Merge pull request #13154 from Unholychick/casts 
Core/Spells: Fix some -Wconversion warnings
 2014-09-17 16:09:18 +01:00
DDuarte af7daba02d Core/SAI: Remove SMART_ACTION_STORE_VARIABLE_DECIMAL 
It's not used.
 2014-09-17 01:07:29 +01:00
Duarte Duarte a6ed252527 Rename 2014_09_13_05_335world_misc.sql to 2014_09_13_05world_misc_335.sql 2014-09-14 01:50:59 +01:00
Duarte Duarte 7274a4f832 DB/Waypoints: Correct text of Artificer Daelo 
Fixes #13130
Ref 27479cf571
 2014-09-14 01:50:42 +01:00
DDuarte 073221c395 SQL: Update /dev/world_database.sql 
Forgotten change of 27479cf571
 2014-09-13 02:57:05 +01:00
DDuarte 27479cf571 Core/Scripts: Nuke db_script_string table and make SCRIPT_COMMAND_TALK with broadcast_text instead 
Original code by @Ascathor with modifications
Closes #13092
 2014-09-13 02:45:51 +01:00
DDuarte dcba0106d6 Core/Skills: Fix rogue's lock picking 
Fixes #12677
Closes #13111
 2014-09-12 18:11:19 +01:00
DDuarte b3166030a0 Core/Group: Update enum GroupType 2014-09-12 02:15:14 +01:00
DDuarte b786633601 DB/Locales: Correct multiple quest names for the 3.3.5 patch 
Ref  #13075
 2014-09-10 01:05:18 +01:00
DDuarte 2f8587b1c4 DB/Locales: Correct multiple npc names for the 3.3.5 patch 
Closes #13075
 2014-09-10 00:55:57 +01:00
Duarte Duarte 9b2737c068 Core/Loot: Fix a possible unintialized slot_type in LootMgr 
Noticed by @joschiwald
 2014-09-09 23:40:35 +01:00
DDuarte 2bba219106 Core/Loot: Fix some issues with master loot 
Thanks to @PortgasDAce for the initial patch

Closes #12732
 2014-09-09 23:11:37 +01:00
Duarte Duarte 04415f33a7 Merge pull request #13077 from mik1893/fear_vs_possess 
Core/Unit: Do not give client control back to player after fear/confuse if player is under player charm (UNIT_STATE_POSSESSED)
 2014-09-09 23:07:18 +01:00
Duarte Duarte 2697b18cf2 Core/Net: Fix GCC build 2014-09-09 22:32:27 +01:00
Duarte Duarte c65b407e3b CI/Travis: Yet another attempt at reducing the number of killed builds 2014-09-09 22:31:10 +01:00
Duarte Duarte 5e745f3fbb Merge pull request #13007 from mik1893/Stormstrike 
Core/Spells: Stormstrike should stack for different casters
 2014-09-08 14:17:13 +01:00
DDuarte 32ca780a2f DB/NPCs: Fix unit_class of some difficulty entries (DBErrors) 2014-09-07 17:53:11 +01:00