Changeset 44 for trunk/contrib

Show
Ignore:
Timestamp:
11/19/08 13:27:40 (17 years ago)
Author:
yumileroy
Message:

[svn] * Merge Temp dev SVN with Assembla.
* Changes include:

  • Implementation of w12x's Outdoor PvP and Game Event Systems.
  • Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
  • All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
  • Improved Config cleanup.
  • And many more changes.

Original author: Seline
Date: 2008-10-14 11:57:03-05:00

Location:
trunk/contrib
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/contrib/Makefile.am

    r23 r44  
    55# This program is free software; you can redistribute it and/or modify 
    66# it under the terms of the GNU General Public License as published by 
    7 # the Free Software Foundation; either version 3 of the License, or 
     7# the Free Software Foundation; either version 2 of the License, or 
    88# (at your option) any later version. 
    99# 

  • trunk/contrib/extractor/Makefile

    r24 r44  
    1717# This program is free software; you can redistribute it and/or modify 
    1818# it under the terms of the GNU General Public License as published by 
    19 # the Free Software Foundation; either version 3 of the License, or 
     19# the Free Software Foundation; either version 2 of the License, or 
    2020# (at your option) any later version. 
    2121# 

  • trunk/contrib/vmap_debugger/ModelContainerView.cpp

    r2 r44  
    452452    //==================================================================== 
    453453 
    454     Vector3 ModelContainerView::convertPositionToMangosRep(float x, float y, float z) const { 
     454    Vector3 ModelContainerView::convertPositionToTrinityRep(float x, float y, float z) const { 
    455455        float pos[3]; 
    456456        pos[0] = z; 
    … …  
    491491            i_App->defaultController.getPosition(); 
    492492            Vector3 pos = i_App->defaultController.getPosition(); 
    493             Vector3 pos2 = convertPositionToMangosRep(pos.x, pos.y, pos.z); 
     493            Vector3 pos2 = convertPositionToTrinityRep(pos.x, pos.y, pos.z); 
    494494            //Vector3 pos3 = iVMapManager->convertPositionToInternalRep(pos2.x, pos2.y, pos2.z); 
    495495            //pos3 = iVMapManager->convertPositionToInternalRep(pos2.x, pos2.y, pos2.z); 

  • trunk/contrib/vmap_debugger/ModelContainerView.h

    r2 r44  
    5252        Array<Command> iPrevLoadCommands; 
    5353        private: 
    54                 Vector3 convertPositionToMangosRep(float x, float y, float z) const; 
     54                Vector3 convertPositionToTrinityRep(float x, float y, float z) const; 
    5555 
    5656        public: