* Merge. ;___;

Browse Source

--HG--
branch : trunk

...

This commit is contained in:

XTZGZoReX committed 2010-06-07 00:14:26 +02:00

2 parents 4ee29a2a0d b13cb5d113

commit 81610ac190

569 files changed

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/FULL/CMakeLists.txt → sql/full/CMakeLists.txt

File renamed without changes.

sql/FULL/world_script_texts.sql → sql/full/world_script_texts.sql

File renamed without changes.

sql/FULL/world_script_waypoints.sql → sql/full/world_script_waypoints.sql

File renamed without changes.

sql/FULL/world_scripts_full.sql → sql/full/world_scripts_full.sql

File renamed without changes.

src/server/scripts/custom/custom_example.cpp → src/server/scripts/Custom/custom_example.cpp

File renamed without changes.

src/server/scripts/custom/custom_gossip_codebox.cpp → src/server/scripts/Custom/custom_gossip_codebox.cpp

File renamed without changes.

src/server/scripts/custom/npc_acherus_taxi.cpp → src/server/scripts/Custom/npc_acherus_taxi.cpp

File renamed without changes.

src/server/scripts/custom/npc_wyrmresttempel_taxi.cpp → src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp

File renamed without changes.

src/server/scripts/custom/on_events.cpp → src/server/scripts/Custom/on_events.cpp

File renamed without changes.

src/server/scripts/custom/test.cpp → src/server/scripts/Custom/test.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/alterac_mountains.cpp → src/server/scripts/EasternKingdoms/alterac_mountains.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp → src/server/scripts/EasternKingdoms/alterac_valley/alterac_valley.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp → src/server/scripts/EasternKingdoms/alterac_valley/boss_balinda.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp → src/server/scripts/EasternKingdoms/alterac_valley/boss_drekthar.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp → src/server/scripts/EasternKingdoms/alterac_valley/boss_galvangar.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp → src/server/scripts/EasternKingdoms/alterac_valley/boss_vanndar.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/arathi_highlands.cpp → src/server/scripts/EasternKingdoms/arathi_highlands.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/blackrock_depths.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h → src/server/scripts/EasternKingdoms/blackrock_depths/blackrock_depths.h

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_ambassador_flamelash.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_anubshiah.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_general_angerforge.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_grizzle.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_magmus.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_moira_bronzebeard.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/boss_tomb_of_seven.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp → src/server/scripts/EasternKingdoms/blackrock_depths/instance_blackrock_depths.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/blackrock_spire.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h → src/server/scripts/EasternKingdoms/blackrock_spire/blackrock_spire.h

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_drakkisath.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_gyth.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_halycon.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_highlord_omokk.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_mother_smolderweb.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_quartermaster_zigris.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_rend_blackhand.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_the_beast.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/boss_warmaster_voone.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp → src/server/scripts/EasternKingdoms/blackrock_spire/instance_blackrock_spire.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_chromaggus.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_ebonroc.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_firemaw.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_flamegor.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_nefarian.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_razorgore.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_vaelastrasz.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/boss_victor_nefarius.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp → src/server/scripts/EasternKingdoms/blackwing_lair/instance_blackwing_lair.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/blasted_lands.cpp → src/server/scripts/EasternKingdoms/blasted_lands.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/boss_kruul.cpp → src/server/scripts/EasternKingdoms/boss_kruul.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/burning_steppes.cpp → src/server/scripts/EasternKingdoms/burning_steppes.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp → src/server/scripts/EasternKingdoms/deadmines/boss_mr_smite.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/deadmines/deadmines.cpp → src/server/scripts/EasternKingdoms/deadmines/deadmines.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/deadmines/deadmines.h → src/server/scripts/EasternKingdoms/deadmines/deadmines.h

File renamed without changes.

src/server/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp → src/server/scripts/EasternKingdoms/deadmines/instance_deadmines.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/dun_morogh.cpp → src/server/scripts/EasternKingdoms/dun_morogh.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/duskwood.cpp → src/server/scripts/EasternKingdoms/duskwood.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/eastern_plaguelands.cpp → src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/elwynn_forest.cpp → src/server/scripts/EasternKingdoms/elwynn_forest.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/eversong_woods.cpp → src/server/scripts/EasternKingdoms/eversong_woods.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/ghostlands.cpp → src/server/scripts/EasternKingdoms/ghostlands.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp → src/server/scripts/EasternKingdoms/gnomeregan/gnomeregan.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h → src/server/scripts/EasternKingdoms/gnomeregan/gnomeregan.h

File renamed without changes.

src/server/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp → src/server/scripts/EasternKingdoms/gnomeregan/instance_gnomeregan.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/hinterlands.cpp → src/server/scripts/EasternKingdoms/hinterlands.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/ironforge.cpp → src/server/scripts/EasternKingdoms/ironforge.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/isle_of_queldanas.cpp → src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_curator.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_curator.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_maiden_of_virtue.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_midnight.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_moroes.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_netherspite.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_nightbane.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_prince_malchezaar.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_shade_of_aran.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp → src/server/scripts/EasternKingdoms/karazhan/boss_terestian_illhoof.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp → src/server/scripts/EasternKingdoms/karazhan/bosses_opera.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp → src/server/scripts/EasternKingdoms/karazhan/instance_karazhan.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/karazhan.cpp → src/server/scripts/EasternKingdoms/karazhan/karazhan.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/karazhan/karazhan.h → src/server/scripts/EasternKingdoms/karazhan/karazhan.h

File renamed without changes.

src/server/scripts/eastern_kingdoms/loch_modan.cpp → src/server/scripts/EasternKingdoms/loch_modan.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp → src/server/scripts/EasternKingdoms/magisters_terrace/boss_felblood_kaelthas.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp → src/server/scripts/EasternKingdoms/magisters_terrace/boss_priestess_delrissa.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp → src/server/scripts/EasternKingdoms/magisters_terrace/boss_selin_fireheart.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp → src/server/scripts/EasternKingdoms/magisters_terrace/boss_vexallus.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp → src/server/scripts/EasternKingdoms/magisters_terrace/instance_magisters_terrace.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp → src/server/scripts/EasternKingdoms/magisters_terrace/magisters_terrace.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h → src/server/scripts/EasternKingdoms/magisters_terrace/magisters_terrace.h

File renamed without changes.

src/server/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp → src/server/scripts/EasternKingdoms/molten_core/boss_baron_geddon.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/molten_core/boss_garr.cpp → src/server/scripts/EasternKingdoms/molten_core/boss_garr.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp → src/server/scripts/EasternKingdoms/molten_core/boss_gehennas.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp → src/server/scripts/EasternKingdoms/molten_core/boss_golemagg.cpp

File renamed without changes.

src/server/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp → src/server/scripts/EasternKingdoms/molten_core/boss_lucifron.cpp

File renamed without changes.

Loaded 100 of 569 files, more files were not shown because too many files have changed in this diff. Show more