Skip to content

Commit

Permalink
Merge pull request #203 from Synesthesias/release/v2.2.0
Browse files Browse the repository at this point in the history
Release/v2.2.0
  • Loading branch information
linoal authored Dec 27, 2023
2 parents f96bbca + f3c58b2 commit 7f8c2fe
Show file tree
Hide file tree
Showing 554 changed files with 6,352 additions and 3,228 deletions.
5 changes: 4 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*.lib filter=lfs diff=lfs merge=lfs -text
*.a filter=lfs diff=lfs merge=lfs -text
/lfs/** filter=lfs diff=lfs merge=lfs -text
/lfs/** filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.uasset filter=lfs diff=lfs merge=lfs -text
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
## マージ前確認項目
- [ ] Squash and Mergeが選択されていること
- [ ] UI、挙動に変更ある場合、ユーザーマニュアルが更新されていること
- [ ] [ユニットテスト](/Documentation/developer-guide/UnitTest.md)が通っていること

## 動作確認
<!-- レビュアーが動作確認するのに必要な手順と結果を書く。 -->
Expand Down
Binary file modified Content/AreaIcon_NoText/LOD01/bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/building.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/other.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/plants.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/props.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/terrain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/traffic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD01/underground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/building.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/other.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/plants.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/props.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/terrain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/traffic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD2/underground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/building.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/other.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/plants.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/props.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/terrain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/traffic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD3/underground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD4/bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/AreaIcon_NoText/LOD4/building.png
Binary file modified Content/AreaIcon_NoText/LOD4/other.png
Binary file modified Content/AreaIcon_NoText/LOD4/plants.png
Binary file modified Content/AreaIcon_NoText/LOD4/props.png
Binary file modified Content/AreaIcon_NoText/LOD4/terrain.png
Binary file modified Content/AreaIcon_NoText/LOD4/traffic.png
Binary file modified Content/AreaIcon_NoText/LOD4/underground.png
Binary file modified Content/AreaIcon_WithText/LOD01/bridge.png
Binary file modified Content/AreaIcon_WithText/LOD01/building.png
Binary file modified Content/AreaIcon_WithText/LOD01/other.png
Binary file modified Content/AreaIcon_WithText/LOD01/plants.png
Binary file modified Content/AreaIcon_WithText/LOD01/props.png
Binary file modified Content/AreaIcon_WithText/LOD01/terrain.png
Binary file modified Content/AreaIcon_WithText/LOD01/traffic.png
Binary file modified Content/AreaIcon_WithText/LOD01/underground.png
Binary file modified Content/AreaIcon_WithText/LOD2/bridge.png
Binary file modified Content/AreaIcon_WithText/LOD2/building.png
Binary file modified Content/AreaIcon_WithText/LOD2/other.png
Binary file modified Content/AreaIcon_WithText/LOD2/plants.png
Binary file modified Content/AreaIcon_WithText/LOD2/props.png
Binary file modified Content/AreaIcon_WithText/LOD2/terrain.png
Binary file modified Content/AreaIcon_WithText/LOD2/traffic.png
Binary file modified Content/AreaIcon_WithText/LOD2/underground.png
Binary file modified Content/AreaIcon_WithText/LOD3/bridge.png
Binary file modified Content/AreaIcon_WithText/LOD3/building.png
Binary file modified Content/AreaIcon_WithText/LOD3/other.png
Binary file modified Content/AreaIcon_WithText/LOD3/plants.png
Binary file modified Content/AreaIcon_WithText/LOD3/props.png
Binary file modified Content/AreaIcon_WithText/LOD3/terrain.png
Binary file modified Content/AreaIcon_WithText/LOD3/traffic.png
Binary file modified Content/AreaIcon_WithText/LOD3/underground.png
Binary file modified Content/AreaIcon_WithText/LOD4/bridge.png
Binary file modified Content/AreaIcon_WithText/LOD4/building.png
Binary file modified Content/AreaIcon_WithText/LOD4/other.png
Binary file modified Content/AreaIcon_WithText/LOD4/plants.png
Binary file modified Content/AreaIcon_WithText/LOD4/props.png
Binary file modified Content/AreaIcon_WithText/LOD4/terrain.png
Binary file modified Content/AreaIcon_WithText/LOD4/traffic.png
Binary file modified Content/AreaIcon_WithText/LOD4/underground.png
Binary file modified Content/Blueprints/BP_PLATEAUBPLibrary.uasset
Binary file not shown.
Binary file modified Content/ClickEventController.uasset
Binary file not shown.
Binary file modified Content/ClickEventGameMode.uasset
Binary file not shown.
3 changes: 3 additions & 0 deletions Content/EUW/AttributeInfoTab.uasset
Git LFS file not shown
Binary file modified Content/EUW/Enum/EActorSelectEventResult.uasset
Binary file not shown.
Binary file modified Content/EUW/Enum/EAttrInfoError.uasset
Binary file not shown.
3 changes: 3 additions & 0 deletions Content/EUW/ExportTab.uasset
Git LFS file not shown
3 changes: 3 additions & 0 deletions Content/EUW/GameObjectFilteringTab.uasset
Git LFS file not shown
3 changes: 3 additions & 0 deletions Content/EUW/GetClickedCityObject.uasset
Git LFS file not shown
3 changes: 3 additions & 0 deletions Content/EUW/ImportTab.uasset
Git LFS file not shown
Binary file modified Content/EUW/LogicBP/RaycastCityObject.uasset
Binary file not shown.
Binary file modified Content/EUW/MainWindow.uasset
Binary file not shown.
3 changes: 3 additions & 0 deletions Content/EUW/MaterialClassificationTab.uasset
Git LFS file not shown
3 changes: 3 additions & 0 deletions Content/EUW/ModelAdjustmentTab.uasset
Git LFS file not shown
3 changes: 3 additions & 0 deletions Content/EUW/ModelReconstructTab.uasset
Git LFS file not shown
Binary file modified Content/EUW/WidgetBP/BaseDetailParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/FeatureSettingParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/FilterBuildingDetailParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/FilterGeneralDetailParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/FilterReliefDetailParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/FilterVegetationDetailParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/ImportProgressDetailParts.uasset
Binary file not shown.
3 changes: 3 additions & 0 deletions Content/EUW/WidgetBP/MaterialClassificationParts.uasset
Git LFS file not shown
Binary file modified Content/EUW/WidgetBP/MaterialSelectParts.uasset
Binary file not shown.
Binary file modified Content/EUW/WidgetBP/SerializedCityObjectsParts.uasset
Binary file not shown.
Binary file modified Content/FeatureInfoPanel_PanelIcon.uasset
Binary file not shown.
Binary file modified Content/FlatButton.png
Binary file modified Content/Materials/DefaultMaterial.uasset
Binary file not shown.
Binary file modified Content/Materials/DefaultMaterial_No_Texture.uasset
Binary file not shown.
Binary file modified Content/Materials/Fallback/DualSampleMaterialInstance.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 7f8c2fe

Please sign in to comment.