yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into ghMaster

Browse Source
This commit is contained in:
Sarjuuk
2017-03-25 01:35:21 +01:00
parent f0e1e02f03 a937fb7ac6
commit 1a04ee3354
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/tools/clisetup/build.func.php
View File

@@ -81,7 +81,7 @@ function build($syncMe = null)
else else
CLISetup::log('finished file generation with errors', CLISetup::LOG_ERROR); CLISetup::log('finished file generation with errors', CLISetup::LOG_ERROR);
} }
else else if ($syncMe)
CLISetup::log('no valid script names supplied', CLISetup::LOG_ERROR); CLISetup::log('no valid script names supplied', CLISetup::LOG_ERROR);
return $done; return $done;

2
setup/tools/clisetup/firstrun.func.php
View File

@@ -74,6 +74,8 @@ function firstrun()
['SqlGen::generate', 'itemset', null, null, null], ['SqlGen::generate', 'itemset', null, null, null],
['SqlGen::generate', 'item_stats', null, null, null], ['SqlGen::generate', 'item_stats', null, null, null],
['SqlGen::generate', 'source', null, null, null], ['SqlGen::generate', 'source', null, null, null],
['SqlGen::generate', 'sounds', null, null, null],
['FileGen::generate', 'soundfiles', null, null, null],
['FileGen::generate', 'searchplugin', null, null, null], ['FileGen::generate', 'searchplugin', null, null, null],
['FileGen::generate', 'power', null, null, null], ['FileGen::generate', 'power', null, null, null],
['FileGen::generate', 'searchboxScript', null, null, null], ['FileGen::generate', 'searchboxScript', null, null, null],

2
setup/tools/clisetup/sql.func.php
View File

@@ -47,7 +47,7 @@ function sql($syncMe = null)
else else
CLISetup::log('finished sql generation with errors', CLISetup::LOG_ERROR); CLISetup::log('finished sql generation with errors', CLISetup::LOG_ERROR);
} }
else else if ($syncMe)
CLISetup::log('no valid script names supplied', CLISetup::LOG_ERROR); CLISetup::log('no valid script names supplied', CLISetup::LOG_ERROR);
return $done; return $done;

1
setup/tools/filegen/soundfiles.func.php
View File

@@ -22,6 +22,7 @@ if (!CLI)
{ {
$i = 0; $i = 0;
CLISetup::log(' - '.$itr.'/'.$nFiles.' ('.(intVal(100 * $itr / $nFiles).'%) done')); CLISetup::log(' - '.$itr.'/'.$nFiles.' ('.(intVal(100 * $itr / $nFiles).'%) done'));
DB::Aowow()->selectCell('SELECT 1'); // keep mysql busy or it may go away
} }
if (stristr($filePath, '.wav')) // expected file.wav.ogg if (stristr($filePath, '.wav')) // expected file.wav.ogg

3
setup/tools/sqlgen/sounds.func.php
View File

@@ -48,7 +48,8 @@ function sounds(/*array $ids = [] */)
CLISetup::log(' - sounds main data'); CLISetup::log(' - sounds main data');
// file extraction and conversion in build step. data here is purely structural // file extraction and conversion manually
// moving files in build step. data here is purely structural
// reality check ... thats probably gigabytes worth of sound.. only growing in size with every locale added on top (RedRocketSite didn't do it. Should i then?) // reality check ... thats probably gigabytes worth of sound.. only growing in size with every locale added on top (RedRocketSite didn't do it. Should i then?)
// .wav => audio/ogg; codecs="vorbis" // .wav => audio/ogg; codecs="vorbis"

2
setup/updates/1488745158_02.sql
View File

@@ -161,4 +161,4 @@ CREATE TABLE IF NOT EXISTS `aowow_spell_sounds` (
/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; /*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
UPDATE aowow_dbversion SET `build` = CONCAT(IFNULL(`build`, ''), ' sounds'), `sql` = CONCAT(IFNULL(`sql`, ''), ' spell creature sounds spawns'); UPDATE aowow_dbversion SET `build` = CONCAT(IFNULL(`build`, ''), ' soundfiles'), `sql` = CONCAT(IFNULL(`sql`, ''), ' spell creature sounds spawns');