• R/O
  • R/O (HTTP)
  • R/W (SSH)
  • R/W (HTTPS)

KCD: Commit

main code repository.


Commit MetaInfo

Revisionbcced10a665d814cfe700ec069c012fa9f1c35ae (tree)
Time2017-01-11 21:00:53
Authormasakih <masakih@user...>
Commitermasakih

Log Message

Merge branch 'master' into convertToSwift

# Conflicts:
# KCD/HMSokuTransformer.m

Change Summary

Incremental Difference

--- a/KCD/Base.lproj/HMShipDetailViewController.xib
+++ b/KCD/Base.lproj/HMShipDetailViewController.xib
@@ -1,7 +1,6 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
33 <dependencies>
4- <deployment identifier="macosx"/>
54 <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
65 <capability name="box content view" minToolsVersion="7.0"/>
76 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -339,15 +338,15 @@
339338 </textFieldCell>
340339 </textField>
341340 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="e8z-uk-5Kj">
342- <rect key="frame" x="160" y="92" width="30" height="14"/>
341+ <rect key="frame" x="160" y="92" width="35" height="14"/>
343342 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
344- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="高速" id="Olc-Xu-clL">
343+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="高速+" id="Olc-Xu-clL">
345344 <font key="font" metaFont="smallSystem"/>
346345 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
347346 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
348347 </textFieldCell>
349348 <connections>
350- <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.master_ship.soku" id="M9h-T3-rlj">
349+ <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.soku" id="Bba-EJ-qC6">
351350 <dictionary key="options">
352351 <string key="NSNoSelectionPlaceholder">-</string>
353352 <string key="NSValueTransformerName">HMSokuTransformer</string>
--- a/KCD/HMMemberShipCommand.m
+++ b/KCD/HMMemberShipCommand.m
@@ -43,8 +43,8 @@
4343 @"api_voicef", @"api_afterlv", @"api_aftershipid", @"api_backs",
4444 @"api_slotnum", @"api_stype", @"api_name", @"api_yomi",
4545 @"api_raig", @"api_luck", @"api_saku", @"api_raim", @"api_baku",
46- @"api_taik", @"api_houg", @"api_souk", @"api_houm", @"api_tyku",
47- @"api_ndock_item", @"api_soku", @"api_star",
46+ @"api_taik", @"api_houg", @"api_houm", @"api_tyku",
47+ @"api_ndock_item", @"api_star",
4848 @"api_ndock_time_str", @"api_member_id", @"api_fuel_max", @"api_bull_max"];
4949 return ignoreKeys;
5050 }
--- a/KCD/KCD-Info.plist
+++ b/KCD/KCD-Info.plist
@@ -34,7 +34,7 @@
3434 <key>CFBundlePackageType</key>
3535 <string>APPL</string>
3636 <key>CFBundleShortVersionString</key>
37- <string>1.8b7</string>
37+ <string>1.8b8</string>
3838 <key>CFBundleSignature</key>
3939 <string>????</string>
4040 <key>CFBundleVersion</key>
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -330,6 +330,7 @@
330330 <attribute name="slot_3" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
331331 <attribute name="slot_4" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
332332 <attribute name="slot_ex" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
333+ <attribute name="soku" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
333334 <attribute name="sortno" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
334335 <attribute name="soukou_0" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
335336 <attribute name="soukou_1" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -371,7 +372,7 @@
371372 <element name="Material" positionX="0" positionY="0" width="128" height="165"/>
372373 <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="30"/>
373374 <element name="Quest" positionX="0" positionY="0" width="128" height="240"/>
374- <element name="Ship" positionX="0" positionY="0" width="128" height="825"/>
375+ <element name="Ship" positionX="0" positionY="0" width="128" height="840"/>
375376 <element name="SlotItem" positionX="0" positionY="0" width="128" height="165"/>
376377 </elements>
377378 </model>
\ No newline at end of file
Binary files a/KCD/ja.lproj/Localizable.strings and b/KCD/ja.lproj/Localizable.strings differ
--- a/KCD/ja.lproj/Localizable.strings.sed
+++ b/KCD/ja.lproj/Localizable.strings.sed
@@ -30,7 +30,9 @@ s/Long/長/2
3030 s/Middle/中/2
3131 s/Short/短/2
3232 s/Slow/低速/2
33-s/Fast/高速/2
33+s/Fast"/高速"/2
34+s/Faster"/高速+"/2
35+s/Fastest"/最速"/2
3436 s/Deleting caches.../キャッシュを削除中.../2
3537 s/Hide Combined View/連合艦隊ビューを隠す/2
3638 s/Show Combined View/連合艦隊ビューを表示/2
--- a/KCD/ja.lproj/SlotItemShortName.plist
+++ b/KCD/ja.lproj/SlotItemShortName.plist
@@ -2,6 +2,8 @@
22 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33 <plist version="1.0">
44 <dict>
5+ <key>33</key>
6+ <string>ター</string>
57 <key>37</key>
68 <string>7.7</string>
79 <key>38</key>
Binary files a/KCD/zh-Hant-TW.lproj/Localizable.strings and b/KCD/zh-Hant-TW.lproj/Localizable.strings differ
--- a/KCD/zh-Hant-TW.lproj/Localizable.strings.sed
+++ b/KCD/zh-Hant-TW.lproj/Localizable.strings.sed
@@ -30,7 +30,9 @@ s/Long/長/2
3030 s/Middle/中/2
3131 s/Short/短/2
3232 s/Slow/低速/2
33-s/Fast/高速/2
33+s/Fast"/高速"/2
34+s/Faster"/高速+"/2
35+s/Fastest"/最速"/2
3436 s/Deleting caches.../刪除緩存.../2
3537 s/Hide Combined View/隱藏聯合艦隊視窗/2
3638 s/Show Combined View/顯示聯合艦隊視窗/2
Show on old repository browser