Commit Graph

27825 Commits

Author SHA1 Message Date
Killyana
f7bfab4f64 DB/Spawn: Reverse the last commit 2015-11-25 19:41:55 +01:00
Killyana
0bce07941a DB/Spawns: Restore deleted objects
If someone can find where or why those spawns were deleted it will help
2015-11-25 18:52:51 +01:00
Carbenium
e4bdaa0110 Merge pull request #15889 from Zedron/6.x
Core/MMaps: Fixed mmap loading after recent format change
2015-11-25 00:46:52 +01:00
Zedron
32a82dc956 Core/MMaps: Fixed mmap loading
Bug introduced in 1d2aafd
2015-11-24 15:31:49 -06:00
Killyana
b86972f977 DB/Creature: Fix some wrong quest givers
Closes #12752
Closes #15893
2015-11-24 15:45:20 +01:00
Shauren
d5fb18d3c3 Core/Spells: Implemented scaling spell value with item level 2015-11-24 00:16:42 +01:00
Killyana
7430daab1f DB/Quest: Hot and Cold
Updates #15566
2015-11-23 20:15:07 +01:00
Killyana
4315f13380 DB/Condition: Lothos Riftwaker Molten Core teleport
By @Malcrom
Closes #15701
2015-11-23 20:08:18 +01:00
Killyana
ea2a331385 DB/Misc: Spawns for highbank and Twilight Highlands
By @Malcrom
2015-11-23 18:22:12 +01:00
Killyana
c458b10153 DB: End line 2015-11-23 18:09:33 +01:00
Killyana
d6db870974 DB: Add some missing cherry picks
194fda8a4e
182d4e913c
a85bc8aa39
ec0df1120a
2015-11-23 18:05:30 +01:00
Carbenium
0ffc89999e Fix build after recent cherry-picks 2015-11-23 10:32:28 +01:00
Kittnz
e6465b5cb6 Merge pull request #15884 from tkrokli/re-enable_flying_vehicles
Core/Creature: Flying vehicles able to fly again
(cherry picked from commit 38c44fad8d)
2015-11-23 10:12:12 +01:00
Carbenium
94b22d98be Merge pull request #15835 from ariel-/entry
Creature Addon should be updated when entry is changed.
(cherry picked from commit 52692c3f9d)
2015-11-23 10:11:58 +01:00
Aokromes
08e5b6f875 Update UnixInstall.txt
(cherry picked from commit 254aa21a85)
2015-11-23 10:11:57 +01:00
Aokromes
7466d59621 Update UnixInstall.txt
(cherry picked from commit 2639783fe1)
2015-11-23 10:11:56 +01:00
Aokromes
e2bd9c47cc Update UnixInstall.txt
(cherry picked from commit 50afa7c7a5)

Conflicts:
	doc/UnixInstall.txt
2015-11-23 10:11:55 +01:00
jackpoz
7e056e25c7 Core/Quest: Fix issues reported by static analysis
Coverity defect IDs: 1339309, 1339310

(cherry picked from commit fbaed38b5e)
2015-11-23 10:11:55 +01:00
jackpoz
27e65ad33a Core/Player: Fix issue reported by static analysis
Coverity defect IDs: 1010154

(cherry picked from commit 63f2675076)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
2015-11-23 10:11:54 +01:00
MitchesD
843955b8bf Merge pull request #15732 from ShinDarth/reset-health-mana
Scripts/Duel: implement duel reset of health and mana and improve duel reset
(cherry picked from commit a1150ce20f)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
2015-11-23 10:11:53 +01:00
Shauren
7a55541387 Core/PacketIO: Fixed a few swapped opcodes 2015-11-23 00:23:36 +01:00
Shauren
15bccf510b Core/Logging: Build for packet log is now taken from realmlist table for the current realm, thanks @Aokromes for suggestion 2015-11-22 00:11:32 +01:00
Shauren
c14baf1538 Core/Logging: Changed build in packet log 2015-11-22 00:07:35 +01:00
Shauren
035a2b122e Core: Updated to 6.2.3.20726 2015-11-21 21:30:05 +01:00
Gacko
7f075ae746 Tools/VMapExtractor: Do not append "Data" twice. 2015-11-21 00:22:52 +01:00
Shauren
0df82633cd Buildsystem/Tools: Removed unneeded extra flags from vmap extractor 2015-11-20 21:53:36 +01:00
MitchesD
8dfc753770 Scripts/Commands: updated .npc info to show correct PhaseIDs and PhaseGroups 2015-11-20 20:28:21 +01:00
Shauren
9cc3a0e6da Tools/vmapextractor: Fixed opening casc storage for clients that dont have enUS locale installed 2015-11-19 16:30:57 +01:00
Shauren
e59aace868 Merge pull request #15875 from elseif/6.x
Update System.cpp
2015-11-18 22:36:01 +01:00
elseif
7591fb9d57 Update System.cpp 2015-11-19 03:11:47 +08:00
Shauren
def69c6ead Core/Spells: Fixed Raise Dead cooldown
Closes #15862

(cherry picked from commit ecbbcc8972)
2015-11-17 18:18:06 +01:00
Gacko
6b479e6c3e Server/Config: Fix typo in bnetserver.conf.dist 2015-11-16 21:46:41 +01:00
Carbenium
0064fc2336 Core/Player: Update some function declarations 2015-11-16 03:09:28 +01:00
Carbenium
98dd4d732a Core/Player: Improve log messages 2015-11-16 01:45:53 +01:00
Carbenium
b705ebeb7f Core/Player:
* sprinkle some consts
* replace some C-style casts by static_cast
* replace NULL by nullptr
2015-11-16 01:15:14 +01:00
Shauren
fc852181c5 Core/Misc: Fixed memory leak in trade handler 2015-11-16 00:08:32 +01:00
Gacko
fb242d2b42 Fix build.
Thanks to @jackpoz / @Shauren
2015-11-15 19:55:19 +01:00
Gacko
98e7ab4461 Build/Clang: Suppress unused-local-typedefs warning only for Clang 3.6.0+. 2015-11-15 18:54:32 +01:00
Gacko
27bb569368 Build/Clang: Suppress unused-local-typedefs warning. 2015-11-15 18:28:25 +01:00
Vincent-Michael
b5329d8a03 Core: Revert fail 2015-11-15 16:49:17 +01:00
Vincent-Michael
5d584116fe Core: Added missing overrides 2015-11-15 16:48:12 +01:00
Vincent-Michael
00b4e8b6cc Scripts: Added missing overrides 2015-11-15 03:38:02 +01:00
Vincent-Michael
d80f38ed4f Core/Condition: Remove unused code 2015-11-15 00:40:29 +01:00
Shauren
c63b033131 Core/PacketIO: Updated and enabled guild finder opcodes 2015-11-15 00:13:35 +01:00
blub
2a9a68877a Merge pull request #15729 from Vincent-Michael/gpsTransport
Core/Commands: Added transport position for command .gps
2015-11-14 20:41:50 +01:00
Vincent-Michael
9c99a1d0c7 Core/Commands: Added transport position for command .gps 2015-11-14 20:12:50 +01:00
Naios
25185967e8 Core/Worldserver: Enable the database updater by default.
* Seems like this feature is stable enough to enable it by default
  since the last missing bugs were fixed some months ago.
* The database updater is the preferred method to update the databases
  as described in the wiki: http://collab.kpsn.org/display/tc/Databases+Installation
2015-11-14 16:59:42 +01:00
Carbenium
a1df148182 Missed change 2015-11-14 16:27:51 +01:00
Carbenium
e8ea7b5ede Core/Player: Fix wrong format specifier in a log message
(introduced in 230e820898)
2015-11-14 16:17:07 +01:00
Vincent-Michael
39a5844c6e Core: Fix warning
(cherry picked from commit d0c28c66eb)
2015-11-14 04:25:11 +01:00