Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,582 Commits 4 Branches 146 Tags
0a88787dfc747437b6278a044a425b6483e61b37
Commit Graph

2162 Commits

Author SHA1 Message Date
kaelima
0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h
 2012-12-21 00:00:16 +01:00
Kaelima
05c38b20ea Merge pull request #8668 from joschiwald/random_changes 
Core/Misc:
 2012-12-19 23:48:00 -08:00
Mislav Blažević
200968c2dd Script/AQ: Add Creature Text for Viscidus and fix model scaling 2012-12-19 13:29:55 +01:00
joschiwald
f4e7cde1b5 Core/Misc: 
- some simplifications in reputation calculation
- removed aura in SPELL_AURA_LINKED should depends on SpellDifficulty
- remove some unneeded variable declarations when it's already declared
- remove some hacks
- fix some warnings in Lfg stuff
- some codestyle changes
 2012-12-19 12:55:51 +01:00
Vincent_Michael
7dd019e7bb Misc/Script: Convert winter veil mistletoe event in sai 2012-12-18 22:27:48 +01:00
Vincent_Michael
bcff526d28 Core/Script: Add missing changes in c364c367b1 2012-12-18 19:31:41 +01:00
Vincent_Michael
c364c367b1 Core/Script: Fix some codestyle and warnings 2012-12-18 19:16:00 +01:00
Vincent_Michael
3e318686b0 Core: Fix non pch build 2012-12-18 15:33:15 +01:00
Gacko
40292d9a19 Core/DB: Assign texts to correct creatures 
Also convert some never used script texts to creature text for future use.
Some scripts or Talk() calls need to be implemented first.

Solves #8659
 2012-12-18 15:19:13 +01:00
Mislav Blažević
9991f4ae2d Implement Viscidus AQ40 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-18 14:09:27 +00:00
Aokromes Name
5d77b10c35 Core/Account: Add logs for password change and fail change password 2012-12-18 01:58:12 +01:00
Vincent_Michael
3f82ac9ea7 Core: Fix non pch build 2012-12-18 01:49:08 +01:00
Trista
8c286f2b61 Server/Quest: Convert quest_end_script and drop of some c++ 
* drop off c++ script of Clintan Dreamwalker ID: 22834
* convert quest_end_script of 10964 to SAI
* rewrite and add bigger event support
* add a checker to his summon so the spirit script can trigger event alone (I didn't try to rewrite next quest...)

Closes: #8689
 2012-12-18 02:03:30 +02:00
Trista
323989cc47 Core/Spells: Fix a typo in Bombing Run quests 
* no idea how this number left like this for so long unseen, good it filters 1 target
 2012-12-18 02:03:29 +02:00
Vincent_Michael
e90ec5608e DB/Scripts: Implemented creature_text for Infinite Corruptor 2012-12-18 00:23:46 +01:00
Trista
5a52acbe40 Core/Quest: Optimize and clean more last commit 
* thx to @Gacko and @click for pointing out problems and give suggestiosn
* Sorry for the mess, forgot I can make more changes after initial change, this should be final...
* 48141bbfa6
 2012-12-17 10:39:54 +02:00
click
aa3980c744 Core: Remove tabs, fix whitespace and fix nonPCH properly (5am, too late for this stuff...) 2012-12-17 05:39:04 +01:00
click
1f88f81c5a Core: Fix non-PCH build again 2012-12-17 04:53:32 +01:00
Trista
48141bbfa6 Core/Quest: Song of Wind and Water 
* cleanned a bit and edited old @Treak fix, credits go to him, the quest will* work 100% blizzlike when target_unit_master #8643 gets a fix for vehicle. What concerns the quest is done. I've already fixed the core kill_credit issue, but needs to be discussed.
* leaving the vehicle_AI until they get integrated correctly to SAI, this can be easily converted after. Currently need to make some hacks to make it work close to good if using SAI. (specificly terrain acts weird at that place)

Closes: #5424
 2012-12-17 04:37:27 +02:00
Nay
377d6c7862 Merge pull request #8131 from flippy84/master 
Core/Script: Heigan phase 2
 2012-12-16 17:03:26 -08:00
Nay
352ed3ec53 Merge pull request #8667 from Kirkhammett/engi_fix 
Core/Script: Fix Dimensional Ripper spell learning
 2012-12-16 17:01:48 -08:00
Vincent_Michael
f96295f6ca DB/Scripts: Implemented creature_text for Trial of the Champion 2012-12-16 21:05:05 +01:00
Filip
6611947a2a Core/Script: Fix Dimensional Ripper spell learning 2012-12-15 02:04:53 +01:00
Vincent_Michael
db6195789d Core: Fix non pch build 2012-12-14 23:31:08 +01:00
Vincent_Michael
d2cc278283 Core/Spells: Rename spell script scripts in correct script name 2012-12-14 23:19:03 +01:00
CeIa
b87cc31106 Scripts/Events/Achievement: fix 'Out With It' 
Credits to @darkman1983

Closes #8211
Closes #8126

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-14 01:23:53 +00:00
Vincent_Michael
ebae4ab249 Core/Hunter: Fix Call of the Wild targets 
Closes #8618
Closes #8610
 2012-12-10 10:36:59 +01:00
WishToDie
6266303841 Fix crash in Blackfathom Deeps. 
Thx Vincent-Michail
Closes #8557
 2012-12-10 07:06:11 +02:00
Gacko
d34a9df70a Core/DB: Last fixes for creaturetext conversion 2012-12-09 20:03:17 +01:00
Vincent_Michael
1e22367ca4 Core/Scripts: Add missing creature_text for eregos 2012-12-08 01:18:26 +01:00
Vincent_Michael
0aea6c8512 Core/Scripts: Add missing creature_text 2012-12-07 19:41:30 +01:00
Vincent_Michael
d96f80cc5d Core/Scripts: Fix crash (need convert in sai) 2012-12-07 17:37:30 +01:00
Gacko
8fbec4156b Core/DB: Creature text for 22 script files 2012-12-07 10:04:40 +01:00
Gacko
f9c0e3c91b Core/DB: Creature text for 53 script files 2012-12-06 18:08:21 +01:00
Vincent-Michael
082c3f4267 Core/Hunter: Fix Furious Howl targets 2012-12-04 20:50:01 +01:00
Vincent-Michael
40b010e3ad Misc/Scripts: Some fixes for creature_text 2012-12-04 20:12:48 +01:00
Vincent-Michael
0a3972db7c Core/Quest: Removed table quest_start_scripts 2012-12-04 11:23:10 +01:00
Vincent-Michael
5a7c4f43b6 Core: Fix typo 2012-12-04 09:32:39 +01:00
Gacko
33c44594cd Core/DB: Creature text for 26 script files 2012-12-03 22:10:18 +01:00
Gacko
a73a7dc43f Core/DB: Creature text for 37 script files 2012-12-02 19:13:57 +01:00
Vincent-Michael
7afbacd6e1 Core/Ulduar: 
- Implemented kill credit for hodir and assembly of iron
- Some cleanup
 2012-12-01 17:34:00 +01:00
Vincent-Michael
ae4d63bb8e Core: Fix some warnings 2012-12-01 14:58:57 +01:00
blub
6a34a4a95b Merge pull request #8510 from Gacko/creaturetext 
Core/DB: Creature text for 24 script files
 2012-12-01 05:37:35 -08:00
blub
5bbd41656c Merge pull request #8522 from joschiwald/creature_text 
Scripts/Ulduar: convert all script_texts to creature_text from this zone
 2012-12-01 05:34:08 -08:00
Vincent-Michael
e4f093cccc Core: Fix more typos (thx Expecto) 2012-12-01 13:51:02 +01:00
Gacko
e8186669c5 Core/DB: Creature text for 24 script files 2012-12-01 11:59:38 +01:00
joschiwald
de96841579 Scripts/Ulduar: convert all script_texts to creature_text from this zone 2012-12-01 04:27:40 +01:00
joschiwald
32c4e30599 Scripts/Ulduar: cleanup Assembly of Iron 2012-11-30 21:37:46 +01:00
Vincent-Michael
ddb6c95042 Core/Spells: Convert Replenishment in spell script 2012-11-30 18:27:34 +01:00
Vincent-Michael
cddc0a09ba Scripts/WailingCaverns: Remove hack for achievement "Wailing Caverns" 2012-11-27 20:06:02 +01:00