Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,248 Commits 4 Branches 146 Tags
da9480557b3f191efab08d6aaf75a21a62512252
Commit Graph

1893 Commits

Author SHA1 Message Date
Nay
da9480557b Core: Fix a typo and whitespace cleanup 2012-08-22 22:56:31 +01:00
Nay
e3ea3b28bd Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.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/worldserver/worldserver.conf.dist
 2012-08-21 23:40:38 +01:00
Nay
5a324ff036 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-20 23:44:35 +01:00
Nay
542521a026 Scripts/Achievements: Remove a duplicated achievement script 2012-08-20 23:43:12 +01:00
Vincent-Michael
d11e71b098 Fix more non PCH build and code style 2012-08-20 23:37:33 +02:00
Vincent-Michael
9df6c4dd70 Fix more non PCH build 2012-08-20 23:12:31 +02:00
Nay
354e46d9e0 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2012-08-20 22:04:57 +01:00
Kandera
b9f60fe56c Core/Wintergrasp: finish implementation for battlefields. this is highly experimental enable at you're own risk. will almost definatly cause issues with the wintergrasp patch floating around 2012-08-20 16:23:24 -04:00
Kandera
e4bf9d5cd4 cleanup merge and some unneeded selects in functions 2012-08-20 13:58:58 -04:00
Kandera
87c50a4ec3 Core/Battlefield: specify correct npc for vehicle teleportations. 2012-08-20 13:52:04 -04:00
Kandera
d6de7dec34 Core/Battlefield: few more updates to wintergrasp vehicle stuff. 2012-08-20 13:52:02 -04:00
Kandera
483f0a6a4e Core/Battlefield: attempt to fix vehicle counter when vehicle is killed. finish correcting alliance/horde siege engine 2012-08-20 13:52:00 -04:00
Kandera
81ba249c79 Core/Battlefield: correct siege vehicle faction types. attempt to fix vehicle creation cast time. 2012-08-20 13:52:00 -04:00
Kandera
aa0ff294d2 Core/Battlefield: Correct previous commit 2012-08-20 13:51:58 -04:00
Kandera
9dd3789719 Core/Battlefield: correct wintergrasp faction for horde (thx kirkita), added grab passenger spell as per sniffs. 2012-08-20 13:51:58 -04:00
Kandera
17e2c3a800 Core/Battlefield: cleanup a magic number 2012-08-20 13:50:51 -04:00
Warpten
094f98d3a9 Battlefield/Wintergrasp: 
* Use correct spells on losing and winning factions
* Enums renaming, lowerCamelCase wherever applicable
* Rename some methods and class attributes for them to sound more English and less Engrish or even Frenglish (\o/)
* Use correct spells when trying to build mechanical units at the Workshops.
 2012-08-20 13:50:49 -04:00
Kandera
d31902d858 Core/Battlefield: Fix issue with previous commit. codestyle cleanup and attempt to fix vehicle issues with worldstates. 2012-08-20 13:49:22 -04:00
Kandera
9c5b1b2bb6 Core/Battlefield: Correctly cast the teleport spell (data from sniffs). codestyle cleanup 2012-08-20 13:49:21 -04:00
Kandera
b700f545c5 Core/Battlefield: fix issues with vehicles. return correct vehicle data when using getdata. small cleanups. codestyle 2012-08-20 13:49:19 -04:00
thomas33
7988edda1c Core/Battlefield: Cleanup 2012-08-20 13:49:17 -04:00
thomas33
c44a723ca0 Core/Battlefield: more cleanup 2012-08-20 13:49:17 -04:00
thomas33
7b0a7ef4f3 Core/Battlefield: cleanup 2012-08-20 13:49:16 -04:00
thomas33
2a4b976e41 Core/Battlefield: pPlayer -> player 2012-08-20 13:49:15 -04:00
Kandera
7491926e0c Core/Battlefield: fix stupid mistakes. sorry! 2012-08-20 13:48:52 -04:00
Kandera
00f8858838 Core/Battlefield: attempt to correctly fix again. 2012-08-20 13:48:51 -04:00
Kandera
e9323b2c2d Core/Battlefield: revert part of previous commit and correctly fix .bf stop crashing 2012-08-20 13:48:50 -04:00
Manuel Carrasco
d7a7a9800b Battlefield: Make sBattlefieldMgr a pointer. By Subv. 2012-08-20 13:48:47 -04:00
Kandera
4c3692cc36 Battlefield/Wintergrasp/Scripts: removed a few unneeded casts. 2012-08-20 13:36:09 -04:00
Kandera
16f2c3a48e merge master into wintergrasp and fix build errors. yay me! 2012-08-20 13:34:04 -04:00
Shocker
ff85ebe632 Fix Didn't Stand a Chance achievement 2012-08-20 13:29:52 -04:00
Nay
afd9c28d8e - Rename scriptnames to keep naming consistent; 
- Template updates and spells to WG vehicles;
- Cleanup SQL files a bit.
 2012-08-20 13:29:22 -04:00
Nay
11652278df Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/tools/vmap4_extractor/vmapexport.cpp
 2012-08-20 16:08:27 +01:00
Shauren
9c3c3cd9ec Core/Items: Updated InventoryResult enum 2012-08-20 15:54:55 +02:00
Faq
28c0874873 Core/Spells: Fixed Libram of Wracking. thnx Vincent-Michael 
Closes #7094
 2012-08-20 10:59:35 +02:00
teyrnon
6cea446f22 Core/Objects: Encapsulated Postion::m_orientation field to ensure it is always normalized to 0-2pi range 
Closes #7400.
 2012-08-20 10:44:14 +02:00
Vincent-Michael
8ca6538f6d Scripts/Zul Gurub: Fix map id in instance script for cata 2012-08-19 01:02:57 +02:00
Vincent-Michael
1be45d1a0a Scripts/Zul Gurub: cleanup for cata 2012-08-18 22:16:41 +02:00
Nay
c43bba98a3 Core: Fix build and cleanup whitespace and double semicolon 2012-08-18 17:56:09 +01:00
Spp
9749fe55f8 Better way to fix some of the warnings of the previous commit 2012-08-17 14:30:10 +02:00
Spp
8da0bbdbb3 Core: Fix compile (Thanks to Sovak for reporting). Remove many warnings and Fix possible out of bounds access to Void storage 2012-08-17 10:25:29 +02:00
Greymane
759e73c78f Core/Spells: 
* Implemented aura 328 SPELL_AURA_PROC_ON_POWER_AMOUNT.
* Added eclipse power energize handling.

Closes #7417
 2012-08-16 19:55:01 +01:00
Shauren
21b1b72a6b Scripts/Commands: Fixed remaining crashes caused by removal of dbc locales 2012-08-16 13:27:54 +02:00
Nay
ca2bc35713 Misc: CRLF to LF, whitespace cleanup and tabs to spaces 2012-08-15 21:30:55 +01:00
Nay
ca879e96b0 Core/Loading: Fix a field type when loading reputation_spillover_template 
Also whitespace cleanup
 2012-08-15 21:22:29 +01:00
Nay
c29eb1f87a Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-15 16:33:00 +01:00
Vincent-Michael
a306d39bb4 Core/Scripts: Missing change from previous commit 2012-08-15 00:06:19 +02:00
Vincent-Michael
bddaf9b3a4 Core/Scripts: Fix uninitialized variable in boss_akilzon 2012-08-14 23:58:08 +02:00
Vincent-Michael
302051da3d Core/Scripts: Fixed more uninitialized variables 2012-08-14 23:46:42 +02:00
Nay
c0adf370e5 Core/Vendors: Add currencies to vendors 
npc_vendor table gets a new field, type (1 is item, 2 is currency)
for type 1 fields still mean the same, for type 2 maxcount is buycount (without any "precision")

changed structure of SMSG_UPDATE_CURRENCY(_WEEK_LIMIT) but not enabled, wrong values are being wrongly calculated
 2012-08-14 18:11:06 +01:00