Commit Graph
100 Commits
Author SHA1 Message Date
Aokromes 706b5625fe Merge branch 'findzmq' into '4.3.4'
Corrected issues with ZeroMQ and VS2015

Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used.

See merge request !3
2016-01-10 21:51:09 +00:00
Aokromes cabf159308 Merge branch 'free' into '4.3.4'
Replace missing delete data with dtFree

Ref: Mismatched free() / delete / delete []
 at 0x4C2A360: operator delete(void*) (vg_replace_malloc.c:507)
 by 0x21EF5B1: MMAP::MMapManager::UnloadPhaseTile(std::__detail::_Node_const_iterator<std::pair<unsigned int const, std::vector<unsigned int, std::allocator<unsigned int> > >, false, false>, int, int) (MMapManager.cpp:300)

See merge request !2
2016-01-07 22:57:52 +00:00
Aokromes 6a4336034b DB/Misc: 3.3.5a fixes 2016-01-07 10:21:03 +01:00
Aokromes 8eb002e8ff DB/Misc: 3.3.5a fixes 2016-01-04 11:07:27 +01:00
Aokromes 4be99a50e9 DB/Misc: 3.3.5a fixes 2015-12-18 09:53:29 +01:00
Aokromes b2c0c0ac04 DB/Misc: 3.3.5a fixes 2015-11-29 13:48:31 +01:00
Aokromes d4810088a5 DB/Misc: disable 3.3.5a fixes 2015-11-24 23:09:07 +01:00
Aokromes f68b99b9a6 DB/Misc: 3.3.5a db fixes 2015-11-24 16:48:13 +01:00
Aokromes c91c6fd183 DB/Misc: Fix incorrect commit 2015-11-19 23:12:54 +01:00
Aokromes d309f11435 DB/Misc: Typo fix 2015-11-19 22:28:59 +01:00
Aokromes c4229eece2 DB/Misc: Fix import 2015-11-19 22:14:00 +01:00
Aokromes 973e319bdc DB/Misc: 3.3.5a fixes 2015-11-18 11:32:59 +01:00
Aokromes 4f2e553f88 DB/Misc: fix 3.3.5a only commit 2015-11-11 01:31:53 +01:00
Aokromes e7abb9dd54 DB/Misc: 3.3.5a fixes 2015-11-11 01:30:41 +01:00
Aokromes bf3edbc9dc DB/Misc: Travis fix 2015-11-02 15:57:15 +01:00
Aokromes 9a6e470bf8 DB/Misc: Spawns for highbank
By Malcrom
2015-11-02 15:52:45 +01:00
Aokromes 365935f5e9 DB/Misc: Twilight Highlands Area: 5140 Highbank Phase 361
By Malcrom
2015-11-02 15:46:54 +01:00
Aokromes 6829f89c30 DB/Misc: Hollows End Gameobject Spawns for highbank
By Malcrom
2015-11-02 15:44:39 +01:00
Aokromes d9417a3d9f DB/Misc: Twilight Highlands Area: 5140 Highbank Phase 169
By Malcrom
2015-11-02 15:41:22 +01:00
Aokromes 03dc96b4c4 Core/Misc: Fix build 2015-11-01 20:02:41 +01:00
Aokromes c58f540348 Core/Conditions: Phase condition changes
* SourceGroup defines which phase should the condition affect

* SourceEntry limits the area of the phase (alternatively 0 means all areas)
2015-11-01 19:11:52 +01:00
Aokromes 2a0df059f3 DB/Misc: AQ fixes
by Malcrom
2015-10-30 15:35:47 +01:00
Aokromes 630da1b60e DB/Misc: 3.3.5a Fixes 2015-10-30 15:30:37 +01:00
Aokromes 966aa44ff4 DB/Misc: 3.3.5a fixes 2015-10-18 11:32:45 +02:00
Aokromes e3ea383237 DB/Misc: 3.3.5a Fixes 2015-10-14 10:25:01 +02:00
Aokromes 95618aa12a DB/Misc: Spawn Blackwing Descent 2015-10-02 00:51:43 +02:00
Aokromes 6ebca49afb DB/Misc: More Travis 2015-10-01 10:39:33 +02:00
Aokromes 412384b78a DB/Misc: More Travis 2015-10-01 10:29:43 +02:00
Aokromes a0eb482902 DB/Misc: More travis fix 2015-10-01 10:04:41 +02:00
Aokromes daba736b14 DB/Misc: Add misc 3.3.5a fixes 2015-10-01 09:39:28 +02:00
Aokromes a72ef66712 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2015-09-21 04:02:32 +02:00
Aokromes 99565a24ae DB/Misc: Naxx pathing
By Malcrom
2015-09-21 04:02:20 +02:00
Aokromes 9c47205706 Fix typo 2015-09-19 16:15:51 +00:00
Aokromes f1ff51cdc6 Core/Misc: Fix memleak 2015-09-18 19:58:53 +02:00
Aokromes bb021f4515 Core/Misc: Fix memleak 2015-09-18 19:25:24 +02:00
Aokromes d199edd991 DB/Misc: Horde collectable critters (daily quests)
By Joe Banks, closes #13
2015-09-16 05:03:52 +02:00
Aokromes 63cb81257a DB/Misc: Misc Hoo fixes
By Girip Dragos, updates #16
2015-09-16 04:39:48 +02:00
Aokromes a6077b31ec Core/Gameobject: Fix a crash when enter Hor 2015-09-15 21:20:17 +02:00
Aokromes 9ec2bad547 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2015-09-13 18:49:23 +02:00
Aokromes b3f1ce134d DB/Misc: Remove no longer existing achievement criteria ids 2015-09-13 18:41:32 +02:00
Aokromes 5c23e0b61f DB/Misc: Fix Stratholme final boss
Closes #21
2015-09-11 11:49:40 +02:00
Aokromes af84f0b153 DB/Misc: Fix travis 2015-09-11 06:26:54 +02:00
Aokromes 9cdc55d023 DB/Misc: Fix travis 2015-09-11 06:17:11 +02:00
Aokromes 5beae594af DB/Misc: Fix travis 2015-09-11 06:13:01 +02:00
Aokromes 4fda525eb3 DB/Misc: Typo fix 2015-09-11 06:01:20 +02:00
Aokromes 7d371065c8 DB/Misc: 3.3.5a fixes 2015-09-11 05:55:40 +02:00
Aokromes 4295266886 Revert previous commit 2015-09-09 05:29:56 +02:00
Aokromes 46234c5f37 Build/Misc: Implement clang 3.6 2015-09-09 05:19:36 +02:00
Aokromes 1d71c64374 DB/Misc: More travis fix 2015-09-09 05:00:08 +02:00
Aokromes fffb544b31 DB/Misc: Try to fix travis, again 2015-09-09 04:47:00 +02:00
Aokromes 5878cd46b5 DB/Misc: Sync 3.3.5a db spawns 2015-09-09 04:40:56 +02:00
Aokromes 76839694b0 DB/Misc: Missing newline 2015-09-08 21:10:26 +02:00
Aokromes 0b8b2906ff DB/Misc: Update travis file structure 2015-09-08 19:21:19 +02:00
Aokromes b74a906bff DB/Loot: Fix some HoO loot
By Girip Dragos, updates #16
2015-09-08 05:26:47 +02:00
Aokromes 1709282c2c Core/AHbot: fix seller guids
closes ##18
2015-09-08 05:16:08 +02:00
Aokromes 31713934be DB/Gameobject: Golden Sansam spawns
By Malcrom
2015-09-07 20:37:04 +02:00
Aokromes 410d76fba2 DB/Gameobject: Gromsblood spawns
By Malcrom
2015-09-07 20:31:43 +02:00
Aokromes 9cea79e08d DB/misc: make travis happy 2015-09-07 20:22:58 +02:00
Aokromes d8d14fd444 DB/Gameobjects: Dreamfoil spawns
By Malcrom
2015-09-07 20:10:44 +02:00
Aokromes a4564f2018 DB/misc: fix typo 2015-09-07 20:00:21 +02:00
Aokromes 091373d961 DB/Gameobjects: Purple Lotus spawns
By Malcrom
2015-09-07 19:58:09 +02:00
Aokromes 75a9c26033 DB/Misc: Fix typo 2015-09-07 19:55:00 +02:00
Aokromes 29b0f94552 DB/Misc: Add missing item to fix startup error
By Malcrom
2015-09-07 06:05:51 +02:00
Aokromes 2808d8b578 DB/Misc: Fix some startup errors
By Malcrom, king of fixes
2015-09-07 05:29:57 +02:00
Aokromes 9d451007f9 DB/Misc: Fix late night typo 2015-09-07 05:10:36 +02:00
Aokromes cec7f60d73 DB/Misc: Fix value 2015-09-07 05:08:33 +02:00
Aokromes 0b6aaa28b1 DB/Misc: Fix some startup errors 2015-09-07 05:00:17 +02:00
Aokromes 325a52eb18 DB/Misc: Fix some startup errors 2015-09-04 19:00:05 +02:00
Aokromes 17facf9fff DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-04 10:22:20 +02:00
Aokromes 8dc8e6cc3b DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-04 00:55:35 +02:00
Aokromes 32f222a646 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 21:51:48 +02:00
Aokromes dec5832271 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 20:04:38 +02:00
Aokromes 5e6af98183 DB/Spawns: Move some 4.3.4 spawns to proper rank 2015-09-03 19:47:45 +02:00
Aokromes 84150ad76a DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 19:35:33 +02:00
Aokromes 1bacd449c6 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 19:05:17 +02:00
Aokromes 69f0063c97 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 18:48:57 +02:00
Aokromes 2dd8a61868 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 12:11:38 +02:00
Aokromes 288a46a347 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 11:43:53 +02:00
Aokromes 65a72bde74 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 10:27:45 +02:00
Aokromes 4356f7a58f DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-03 09:06:14 +02:00
Aokromes 046a893f7f DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 22:24:17 +02:00
Aokromes 91c213dda0 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 22:17:25 +02:00
Aokromes 2e9cd049e2 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 22:11:55 +02:00
Aokromes 8be3a1c3ba DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 19:46:44 +02:00
Aokromes bfe840133b DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 17:41:41 +02:00
Aokromes 3836825f9b DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 17:09:44 +02:00
Aokromes 2d2d65ebf5 DB/Creature: Temple Guardian Anhuur loot
By Girip Dragos closes #12
2015-09-02 02:47:47 +02:00
Aokromes 2c5d0e086b DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 02:25:53 +02:00
Aokromes efe605dd79 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 02:14:19 +02:00
Aokromes 319c110812 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-02 02:06:06 +02:00
Aokromes 3a10c8b094 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 20:52:38 +02:00
Aokromes da832da6d4 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 20:36:46 +02:00
Aokromes 01366ffa4d DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 20:28:53 +02:00
Aokromes c5d4150cc5 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 20:15:35 +02:00
Aokromes 0224b75ff1 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 18:55:18 +02:00
Aokromes 9b9222ab1c DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 18:38:48 +02:00
Aokromes b90f661681 DB/Spawns: Delete some duplicate spawns 2015-09-01 18:03:07 +02:00
Aokromes 5cc3da1267 DB/Spawns: Sync some 3.3.5a spawns with 3.3.5a db 2015-09-01 18:00:55 +02:00
Aokromes cff3ac2e0a DB/Misc: Convert most of phaseMasks to PhaseId
Looking for light for phasemask 3,5,10, etc
2015-09-01 17:20:38 +02:00
Aokromes adce344067 DB/Misc: Fix some startup errors 2015-09-01 10:51:13 +02:00