OSDN Git Service

Merge commit 'dfdd077a64951d38c565b992511279e575ed49a6'
author西田 耀 <hikarupsp@users.sourceforge.jp>
Fri, 9 Aug 2013 19:01:11 +0000 (04:01 +0900)
committer西田 耀 <hikarupsp@users.sourceforge.jp>
Fri, 9 Aug 2013 19:01:11 +0000 (04:01 +0900)
commit6f602e726eba2c05b92c584cbead3b2c4c3cc9a0
treef4684d00771f12fa3b32356f8d2e0c1534bfe792
parentef0a8fa4d3cd4a83f42781a37d5a36ee39bd1428
parentdfdd077a64951d38c565b992511279e575ed49a6
Merge commit 'dfdd077a64951d38c565b992511279e575ed49a6'

Conflicts:
www/corelib/classes/CharacterClass.js
www/corelib/classes/GameStageClass.js
www/corelib/core.js
www/stage/main.js

すべての競合は解決されました。
MacOSX Chrome, Safariで動作を確認。
19 files changed:
documents/ClassTree.txt
documents/mysql.txt
documents/tips.html
www/corelib/classes/BlockClass.js
www/corelib/classes/CharacterClass.js
www/corelib/classes/GameStageClass.js
www/corelib/classes/HorizonalScrollStageClass.js
www/corelib/classes/MainCharacterClass.js
www/corelib/classes/MovableStageObjectClass.js
www/corelib/classes/OperatedCharacterClass.js
www/corelib/classes/PCDSLStageClass.js
www/corelib/classes/SlopeBlockClass.js
www/corelib/classes/StageObjectClass.js
www/corelib/core.js
www/header.php
www/index_local_debug.html
www/stage/login.js
www/stage/main.js
www/update.php