Nay
|
6dae8a5a49
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-25 09:27:08 +01:00 |
|
Nay
|
df0519607c
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-23 22:17:52 +01:00 |
|
Nay
|
a7386bd1b3
|
Scripts: Fix some code style issues in scripts
|
2012-09-23 22:16:28 +01:00 |
|
Nay
|
91fd408446
|
Merge pull request #7842 from Elron103/pull-requests2
Core/GameObject: Implement method GetDisplayId, use it for GameObjectModels
|
2012-09-23 07:49:18 -07:00 |
|
Nay
|
e4d08c1186
|
Merge pull request #7555 from Gacko/quest11648
Core: Quest - The art of persuasion
|
2012-09-23 07:48:40 -07:00 |
|
Nay
|
6576d1a93c
|
Merge pull request #7854 from Gacko/utgarde
Core: Utgarde Keep - Last corrections
|
2012-09-23 07:47:10 -07:00 |
|
Nay
|
5faa9d37b4
|
Merge pull request #7835 from Geodar/master
[DB/GameEvents] Correct length of Brewfest event
|
2012-09-22 02:41:36 -07:00 |
|
Nay
|
53cd8cf684
|
Rename SQL after PR merge
|
2012-09-22 02:07:19 +01:00 |
|
Nay
|
435a240a9f
|
Merge pull request #7551 from Gacko/utgarde
Utgarde Keep
|
2012-09-21 18:05:11 -07:00 |
|
Nay
|
0b7a59a98a
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-22 02:03:36 +01:00 |
|
Nay
|
1f03439fc2
|
Merge pull request #7820 from Trista/master
DB/Achievements: Dwarfageddon (10/25) repair previous fix
|
2012-09-19 11:16:05 -07:00 |
|
Nay
|
863229afbe
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-19 00:02:25 +01:00 |
|
Nay
|
92119c9c38
|
Small correction to readme file
|
2012-09-18 23:49:35 +01:00 |
|
Nay
|
23961d0dce
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-17 23:50:08 +01:00 |
|
Nay
|
2e21fa6b92
|
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations
.diff with TC changes added
|
2012-09-17 23:21:01 +01:00 |
|
Nay
|
2431895a54
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
|
2012-09-17 00:04:07 +01:00 |
|
Nay
|
d6b60ce51c
|
Merge pull request #7782 from Trista/master
DB/Skettis: Remove uneeded additions from previous commit and add con…
|
2012-09-15 14:16:13 -07:00 |
|
Nay
|
0d3554d4bf
|
TDB 335.49 - 2012/09/15
|
2012-09-15 21:03:40 +01:00 |
|
Nay
|
8e5578e664
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-15 19:51:09 +01:00 |
|
Nay
|
7b3ea36c8c
|
Merge pull request #7777 from Trista/master
Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
|
2012-09-15 07:44:49 -07:00 |
|
Nay
|
01139ecd38
|
Merge pull request #7768 from MacWarrior/master
Fields ID description in GameEventMgr.cpp
|
2012-09-14 11:16:05 -07:00 |
|
Nay
|
b9b344eb88
|
Merge pull request #7766 from Faq/Misc0
DB/SAI: correct Fix npc Scrapped Fel Reaver. thnx Expecto
|
2012-09-14 09:05:51 -07:00 |
|
Nay
|
9b108fad85
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-13 17:25:13 +01:00 |
|
Nay
|
b9434b6377
|
Merge pull request #7753 from Faq/ScrollOfRecall
Core/Spells: Scroll of Recall
|
2012-09-13 07:03:57 -07:00 |
|
Nay
|
b34d6f5784
|
DB&Scripts: Corrections to pull request #7750
Closes ##7750
|
2012-09-13 15:01:19 +01:00 |
|
Nay
|
97a7775c9b
|
Merge pull request #7747 from Elron103/pull-requests
Core/Mail: Fix merging of items taken from mail leading to invalid entries in item_instance
|
2012-09-13 06:28:04 -07:00 |
|
Nay
|
cfb7ec0efb
|
Merge pull request #7734 from AFROM/patch-1
Update src/server/game/Events/GameEventMgr.cpp
|
2012-09-11 15:14:34 -07:00 |
|
Nay
|
7dcbb7d9bf
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-11 22:39:36 +01:00 |
|
Nay
|
78d0fac217
|
Merge pull request #7731 from w1sht0l1v3/ToCr2
Core/Scripts: Anub'Arak encounter changes and fixes.
|
2012-09-11 13:19:34 -07:00 |
|
Nay
|
b1c4118a33
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-11 01:13:41 +01:00 |
|
Nay
|
4896a1775e
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
|
2012-09-10 00:54:29 +01:00 |
|
Nay
|
50327363ca
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-09 02:26:31 +01:00 |
|
Nay
|
d04f155b65
|
Corrections to previous merged in PR
|
2012-09-09 00:10:23 +01:00 |
|
Nay
|
8f853095f4
|
Merge pull request #7703 from myran2/PR1
Core/Commands: .unstuck command
|
2012-09-08 16:03:15 -07:00 |
|
Nay
|
e0a3643913
|
Core/Characters: Add validation checks to barbershop use (prevents exploits)
Thanks Kiddie
Closes #7702
|
2012-09-08 23:16:35 +01:00 |
|
Nay
|
b30aeb8d51
|
Core/Objects: Method to get nearest GO of type X, FindNearestGameObjectOfType
Thanks Subv for the idea
|
2012-09-08 23:16:35 +01:00 |
|
Nay
|
b03b112327
|
SQL: Update characters_database.sql
|
2012-09-08 15:28:00 +01:00 |
|
Nay
|
6c1bdb3d3c
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
|
2012-09-08 01:32:47 +01:00 |
|
Nay
|
7532013b27
|
Fix a typo in SmartScript.cpp
I blame vincent!
|
2012-09-08 02:15:38 +02:00 |
|
Nay
|
d0e1a6d742
|
Core/Authsocket: Correct field types for an account_banned related query
Thanks @Tuxity
Closes #6373
Closes #7511
|
2012-09-08 00:42:00 +01:00 |
|
Nay
|
faf9f481ef
|
DB/NPCs: Set UNIT_FLAG2_REGENERATE_POWER for all creatures
(exceptions to this rule will have to be fixed)
|
2012-09-07 04:12:45 +01:00 |
|
Nay
|
407286fe81
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
|
2012-09-07 03:34:23 +01:00 |
|
Nay
|
21d43781ac
|
Tabs to spaces...
|
2012-09-07 03:33:16 +01:00 |
|
Nay
|
340dc33b52
|
Fix some code style issues in previous PR merge
|
2012-09-06 19:59:27 +01:00 |
|
Nay
|
334c078184
|
Core/SmartAI: Tiny tiny optimization in an if
|
2012-09-06 19:58:43 +01:00 |
|
Nay
|
c66d254a39
|
Merge pull request #7658 from e000/creature-interrupt
[Core, Creature] Implement Creature/Pet Interrupts
|
2012-09-06 11:58:27 -07:00 |
|
Nay
|
0522e50c86
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Spells/Spell.cpp
|
2012-09-06 18:01:51 +01:00 |
|
Nay
|
42a899a90e
|
Merge pull request #7674 from Aokromes/mmaps
Core/Mmaps: compile fix
|
2012-09-06 05:05:47 -07:00 |
|
Nay
|
ca440756a8
|
Scripts/Commands: Fix .reload creature_template #
|
2012-09-05 19:50:09 +01:00 |
|
Nay
|
4366dd7d83
|
Merge pull request #7657 from e000/master
[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
|
2012-09-04 19:43:04 -07:00 |
|
Nay
|
306e4c173c
|
Fix a merge failure
|
2012-09-04 19:58:39 +01:00 |
|
Nay
|
b4bc78e24b
|
Corrections to previous merged in PR
|
2012-09-04 19:48:29 +01:00 |
|
Nay
|
0ba06342dc
|
Merge pull request #7644 from e000/master
[Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug.
|
2012-09-04 11:46:11 -07:00 |
|
Nay
|
36b3e06a7e
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
|
2012-09-04 19:11:04 +01:00 |
|
Nay
|
73172c67f0
|
Misc: Convert from CRLF to LF in cs_misc.cpp
Also cleanedup whitespace
|
2012-09-04 16:14:15 +01:00 |
|
Nay
|
b2bcc52fda
|
Revert "Core: Blood Furnace - Broggok event"
This reverts commit 153e88a16b.
|
2012-09-04 01:03:06 +01:00 |
|
Nay
|
b979e81dde
|
Merge pull request #7634 from Gacko/blood_furnace
Core: Blood Furnace - Broggok event and fix OnUnitDeath hook use
|
2012-09-03 13:30:27 -07:00 |
|
Nay
|
2fe8c2f41e
|
Dependencies/G3D: Fix build on x64 (change already included in TC's diff)
|
2012-09-03 18:24:35 +01:00 |
|
Nay
|
6acb7f85f4
|
DB/GOs: Correct flags of GO 186371
Thanks Joshh
Closes #6846
|
2012-09-03 17:15:32 +01:00 |
|
Nay
|
c7fed98b9d
|
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
dep/PackageList.txt
|
2012-09-03 15:51:34 +01:00 |
|
Nay
|
0db5573d4d
|
Core/Dependencies: Update G3D to version 8.01
|
2012-09-03 15:39:07 +01:00 |
|
Nay
|
5f6e190a96
|
Core/Dependencies: Update zlib to version 1.2.7
|
2012-09-03 15:37:39 +01:00 |
|
Nay
|
531e16e5b8
|
Core/Dependencies: Update utf8-cpp to version 2.3.2
|
2012-09-03 15:36:36 +01:00 |
|
Nay
|
6cde35955d
|
Core/Dependencies: Update bzip2 to version 1.0.6
|
2012-09-03 15:35:28 +01:00 |
|
Nay
|
c8a91e2559
|
Tools/Extractors: Fix build under GCC 4.7
|
2012-09-03 15:21:52 +01:00 |
|
Nay
|
80b61fa584
|
Core/Spells: Hard-limit the number of hit and miss targets sent in SMSG_SPELL_GO to 255 (each), fixes client crashes
Closes #3873
|
2012-09-03 02:45:27 +01:00 |
|
Nay
|
77c8e0a2a4
|
Merge pull request #7625 from Elron103/pull-requests
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
|
2012-09-02 17:05:34 -07:00 |
|
Nay
|
1a49554af8
|
Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap)
|
2012-09-02 22:52:22 +01:00 |
|
Nay
|
1731ff5ca1
|
SQL: Rename SQL file after PR
|
2012-09-02 15:50:29 +01:00 |
|
Nay
|
40c22de0b7
|
Merge pull request #7587 from acrathos/master
DB/SAI: Thorim and Lok'lira the Crone
|
2012-09-02 07:47:57 -07:00 |
|
Nay
|
ce003baea9
|
Merge pull request #7614 from Elron103/pull-requests2
Core/Scripting: Add missing entry in ScriptLoader for boss Ouro
|
2012-09-01 16:32:51 -07:00 |
|
Nay
|
ffe8c75f17
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-09-01 22:20:33 +01:00 |
|
Nay
|
107bd5f5a3
|
Scripts: Fix non pch build
|
2012-09-01 00:11:44 +01:00 |
|
Nay
|
6b0c2a307b
|
Merge pull request #7599 from gacko28/zuluhed
Core/Spell: Unlocking zuluhed chains
Closes #996
Fixes quest Zuluhed the Whacked
|
2012-08-31 15:58:34 -07:00 |
|
Nay
|
147c698a30
|
SQL: Rename SQL
|
2012-08-31 14:48:05 -05:00 |
|
Nay
|
1a5df2b72e
|
SQL: Rename SQL
|
2012-08-31 01:29:18 +01:00 |
|
Nay
|
e3d9768a50
|
Core: Fix many "errors"/warnings and coding style (3)
Game
Errors were found using Cppcheck, open-source static analysis tool
|
2012-08-30 22:44:33 +01:00 |
|
Nay
|
abbb896cfb
|
Core: Fix many "errors"/warnings and coding style (2)
Scripts; also reverted a change to AuthSocket
Errors were found using Cppcheck, open-source static analysis tool
|
2012-08-30 22:44:03 +01:00 |
|
Nay
|
5f1977cb1d
|
Core: Fix many "errors"/warnings and coding style (1)
Extractors, worldserver, authserver, shared and collision affected
Errors were found using Cppcheck, open-source static analysis tool
|
2012-08-30 19:07:59 +01:00 |
|
Nay
|
902d48811e
|
Merge pull request #7571 from daniik/master
Remove duplicated code in FleeingMovementGenerator
|
2012-08-30 06:31:25 -07:00 |
|
Nay
|
e909e5515b
|
Scripts/Hellfire: Add missing include
|
2012-08-29 22:36:04 +01:00 |
|
Nay
|
b89b8ff277
|
Core/Loading: Change info/error messages to printf when config is not loaded
|
2012-08-29 20:02:55 +01:00 |
|
Nay
|
4070f5ac84
|
Merge pull request #7487 from drskull/master
Core/Spells: Sentry Totem Aura remove fix and some minor fix in totem.cpp
Closes #4376
|
2012-08-29 06:08:13 -07:00 |
|
Nay
|
d6221fc4f7
|
Scripts: Fix code style after PR
|
2012-08-28 20:10:04 -05:00 |
|
Nay
|
d533c950cb
|
Scripts: Fix code style after PR
|
2012-08-28 19:31:15 +01:00 |
|
Nay
|
a9e6f5453b
|
Merge pull request #7553 from Trista/master
Core/Spells: Destabilizing Azure Dragonshrine
|
2012-08-28 11:26:48 -07:00 |
|
Nay
|
6af514d592
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-08-28 19:02:22 +01:00 |
|
Nay
|
154aaa0ad5
|
Core/Quests: Fix quest honor reward
Based on the patch of Tassader
Closes #1356
|
2012-08-28 00:25:49 +01:00 |
|
Nay
|
9a11dc5ea6
|
Config/worldserver: Rename references to the old realmd database to auth
|
2012-08-27 20:42:56 +01:00 |
|
Nay
|
09821b4953
|
SQLS: Fix a typo
|
2012-08-27 17:24:48 +01:00 |
|
Nay
|
9b7b8152e7
|
DB/SAI: Fix opening the door before Broggok in Blood Furnace
Based on the fix of oneblizz
Closes #350
|
2012-08-27 15:38:50 +01:00 |
|
Nay
|
fc16106823
|
Scripts/Spells: Fix a typo in spell_q12372_cast_from_gossip_trigger and cleanup whitespace
|
2012-08-27 14:40:12 +01:00 |
|
Nay
|
f8c01739df
|
Scripts/Spells: Remove a not needed cast in spell_q12372_cast_from_gossip_trigger
|
2012-08-27 14:29:00 +01:00 |
|
Nay
|
846fc6a7fd
|
Rename SQLs after PR
|
2012-08-27 13:52:54 +01:00 |
|
Nay
|
b8bca936e8
|
Merge pull request #7524 from Trista/master
[Core/Scripts] Defending Wyrmrest Temple
|
2012-08-27 05:49:47 -07:00 |
|
Nay
|
3e79dae545
|
Merge remote-tracking branch 'origin/master' into mmaps
|
2012-08-26 23:43:45 +01:00 |
|
Nay
|
30e41724e4
|
Core/Groups: Fix a typo when sending pet auras
|
2012-08-27 00:41:02 +02:00 |
|
Nay
|
e118a7fcc5
|
Core: Fix compiling on Fedora (G3D related)
Thanks F3st and Gamera
Closes #7477
|
2012-08-26 21:45:15 +01:00 |
|
Nay
|
99749b3e88
|
Core/Loading: Move a log from DBError to info
|
2012-08-26 00:24:50 +01:00 |
|
Nay
|
b007fd70c0
|
Misc/WG: Fix conditions
|
2012-08-21 22:58:26 +01:00 |
|