mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
Merge branch 'master' into 303
Conflicts: src/game/CharacterHandler.cpp src/game/Chat.h src/game/Player.h src/game/World.h src/game/debugcmds.cpp
This commit is contained in:
commit
71b1065c8b
50 changed files with 3499 additions and 976 deletions
|
|
@ -15,13 +15,22 @@
|
|||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||
|
||||
|
||||
--
|
||||
-- Table structure for table `saved_variables`
|
||||
--
|
||||
|
||||
CREATE TABLE `saved_variables` (
|
||||
`NextArenaPointDistributionTime` bigint(40) UNSIGNED NOT NULL DEFAULT '0'
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves';
|
||||
|
||||
--
|
||||
-- Table structure for table `character_db_version`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `character_db_version`;
|
||||
CREATE TABLE `character_db_version` (
|
||||
`required_2008_12_03_01_character_guild_member` bit(1) default NULL
|
||||
`required_2008_12_15_01_character_arenas` bit(1) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
|
||||
|
||||
--
|
||||
|
|
@ -95,7 +104,8 @@ CREATE TABLE `arena_team_member` (
|
|||
`played_week` int(10) unsigned NOT NULL default '0',
|
||||
`wons_week` int(10) unsigned NOT NULL default '0',
|
||||
`played_season` int(10) unsigned NOT NULL default '0',
|
||||
`wons_season` int(10) unsigned NOT NULL default '0'
|
||||
`wons_season` int(10) unsigned NOT NULL default '0',
|
||||
`personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
--
|
||||
|
|
@ -223,6 +233,7 @@ CREATE TABLE `characters` (
|
|||
`zone` int(11) unsigned NOT NULL default '0',
|
||||
`death_expire_time` bigint(20) unsigned NOT NULL default '0',
|
||||
`taxi_path` text,
|
||||
`arena_pending_points` int(10) UNSIGNED NOT NULL default '0',
|
||||
PRIMARY KEY (`guid`),
|
||||
KEY `idx_account` (`account`),
|
||||
KEY `idx_online` (`online`),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue