Merge lp:~layer7-inc/eratohoreverse/daily into lp:eratohoreverse
Proposed by
L7switch
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | L7switch | ||||
Approved revision: | no longer in the source branch. | ||||
Merge reported by: | L7switch | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~layer7-inc/eratohoreverse/daily | ||||
Merge into: | lp:eratohoreverse | ||||
Diff against target: |
662 lines (+60/-60) 48 files modified
CSV/CHARA/Chara10_レミリア.csv (+1/-1) CSV/CHARA/Chara13_橙.csv (+1/-1) CSV/CHARA/Chara16_リリカ.csv (+1/-1) CSV/CHARA/Chara17_メルラン.csv (+1/-1) CSV/CHARA/Chara18_ルナサ.csv (+1/-1) CSV/CHARA/Chara21_藍.csv (+1/-1) CSV/CHARA/Chara22_紫.csv (+1/-1) CSV/CHARA/Chara27_てゐ.csv (+1/-1) CSV/CHARA/Chara28_鈴仙.csv (+1/-1) CSV/CHARA/Chara29_永琳.csv (+1/-1) CSV/CHARA/Chara30_輝夜.csv (+1/-1) CSV/CHARA/Chara31_妹紅.csv (+1/-1) CSV/CHARA/Chara34_幽香.csv (+1/-1) CSV/CHARA/Chara42_早苗.csv (+1/-1) CSV/CHARA/Chara43_神奈子.csv (+1/-1) CSV/CHARA/Chara44_諏訪子.csv (+1/-1) CSV/CHARA/Chara49_蓮子.csv (+1/-1) CSV/CHARA/Chara50_マエリベリー.csv (+1/-1) CSV/CHARA/Chara53_豊姫.csv (+1/-1) CSV/CHARA/Chara55_レイセン.csv (+1/-1) CSV/CHARA/Chara60_勇儀.csv (+1/-1) CSV/CHARA/Chara62_燐.csv (+1/-1) CSV/CHARA/Chara63_空.csv (+1/-1) CSV/CHARA/Chara6_美鈴.csv (+1/-1) CSV/CHARA/Chara75_芳香.csv (+1/-1) CSV/CHARA/Chara76_青娥.csv (+1/-1) CSV/CHARA/Chara7_小悪魔.csv (+1/-1) CSV/CHARA/Chara86_弁々.csv (+1/-1) CSV/CHARA/Chara87_八橋.csv (+1/-1) CSV/CHARA/Chara8_パチュリー.csv (+1/-1) CSV/CHARA/Chara97_純狐.csv (+1/-1) CSV/CHARA/Chara98_ヘカーティア.csv (+1/-1) CSV/Exp.csv (+2/-2) ERB/FUNCTION/GETTER/COMMON_GETTER_TRAIN.ERB (+1/-1) ERB/FUNCTION/PROCESS/COMMON_PROCESS_DISP_PALAM.ERB (+1/-1) ERB/SYSTEM/CHARAMAKING/CHARAMAKE_SET_ABL.ERB (+2/-2) ERB/SYSTEM/CHARAMAKING/CHARAMAKE_SET_EXP.ERB (+5/-5) ERB/SYSTEM/DATABASE.ERB (+1/-1) ERB/SYSTEM/SHOP/KYOMI_HOSEI_SHOP.ERB (+1/-1) ERB/SYSTEM/SHOP/SHOP_TRAINERDATA.ERB (+1/-1) ERB/TRAIN/TRAINSYS/ABLUP.ERB (+2/-2) ERB/TRAIN/TRAINSYS/EXP_CHECK.ERB (+5/-5) ERB/TRAIN/USERCOM.ERB (+1/-1) ERB/口上/13_橙/KOJO_EVENT_K13/EV1_2_オープニング_エンディング_K13.ERB (+2/-2) ERB/口上/14_アリス/限定無し_K14/KOJO_COMMON_K14/COMMON_ACT_K14.ERB (+1/-1) ERB/口上/4_大妖精/KOJO_EVENT_K4.ERB (+1/-1) readme/開発資料/eraSQR/GFLAG.txt (+1/-1) readme/開発資料/eratohoReverse/GFLAG.txt (+1/-1) |
||||
To merge this branch: | bzr merge lp:~layer7-inc/eratohoreverse/daily | ||||
Related bugs: |
|
||||
Related blueprints: |
天空璋キャラの追加
(Essential)
EXP:40,レズ経験の変更
(High)
キャラメイキング設問の切り分け
(Medium)
今日の方針の追加-3
(Essential)
DEEP_THROATの実装
(Essential)
鬼形獣キャラの追加
(High)
COMの追加@COM72
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
L7switch | Approve | ||
Review via email: mp+329674@code.launchpad.net |
Commit message
To post a comment you must log in.