Skip to content

main <- develop #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AsPJT merged 243 commits into from
Dec 2, 2025
Merged

main <- develop #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
243 commits
Select commit Hold shift + click to select a range
092fc04
refacotr: メニュー項目の定義を移動
guinpen98 Nov 10, 2025
66160ec
upd: input handle
guinpen98 Nov 10, 2025
71b06f5
refactor: ui
guinpen98 Nov 10, 2025
8d54eb0
add: MapContentInputHandler
guinpen98 Nov 10, 2025
f5d0b89
fix: featureの当たり判定を修正
guinpen98 Nov 10, 2025
4dd8d3d
fix: 不要な関数を削除
guinpen98 Nov 10, 2025
2b850c7
upd: MapContentLayer
guinpen98 Nov 11, 2025
376ca1a
refactor: screen position
guinpen98 Nov 11, 2025
433cd39
fix: check visibility
guinpen98 Nov 11, 2025
a7dbd01
refactor: rename AppComponentManager
guinpen98 Nov 11, 2025
e2ba824
upd: イベント駆動
guinpen98 Nov 11, 2025
d62aa1c
fix: 暦の再生
guinpen98 Nov 11, 2025
c767468
fix: 暦の再生
guinpen98 Nov 11, 2025
4fe534f
refactor: 不要なイベントを削除
guinpen98 Nov 11, 2025
cde78be
refactor: simulation panel
guinpen98 Nov 11, 2025
d25599f
refactor: EventBus
guinpen98 Nov 11, 2025
8f5b268
refactor: 初期化タイミング
guinpen98 Nov 12, 2025
4155311
upd: debug line
guinpen98 Nov 12, 2025
bc8829b
fix: input key
guinpen98 Nov 12, 2025
f2120ed
add: debug layer
guinpen98 Nov 12, 2025
abcd528
refactor: PAX_SAPIENTICA structure
guinpen98 Nov 12, 2025
e45ef3f
upd: file system
guinpen98 Nov 13, 2025
ad49bf7
fix: Color Black
AsPJT Nov 13, 2025
15ae3fb
fix: Settings
AsPJT Nov 13, 2025
09fd245
del: 不要なデータを削除
guinpen98 Nov 13, 2025
72dd476
add: Hokkaido
AsPJT Nov 13, 2025
a462fe9
refactor: AppConfig
guinpen98 Nov 13, 2025
b7538c2
upd: language
AsPJT Nov 13, 2025
777570d
refactor: settings
guinpen98 Nov 13, 2025
6a9414c
upd: genome future
guinpen98 Nov 13, 2025
ab7c74c
upd: menu bar
guinpen98 Nov 13, 2025
4b7edf5
add: LocationDataLoader
guinpen98 Nov 13, 2025
85f0e0d
add: FeatureDetailPanel
guinpen98 Nov 14, 2025
c5f68b4
add: Icon
AsPJT Nov 14, 2025
82745be
fix: Korea site
AsPJT Nov 14, 2025
cdf093e
upd: -対応
guinpen98 Nov 14, 2025
a3611ce
add: close button
guinpen98 Nov 14, 2025
e2a7d56
upd: draw genome name
guinpen98 Nov 14, 2025
2dff58e
ref: 関数分割
guinpen98 Nov 14, 2025
d4cde8a
ref: load texture
guinpen98 Nov 14, 2025
dcfb43c
ref: rename
guinpen98 Nov 15, 2025
0d67b99
upd: add log
guinpen98 Nov 15, 2025
5c923c3
add: Key
AsPJT Nov 15, 2025
ac0815e
upd: 当たり判定
guinpen98 Nov 16, 2025
34013b1
upd: NRCT data
AsPJT Nov 16, 2025
88db091
upd: koyomi debug
guinpen98 Nov 16, 2025
44092f8
fix: Features
AsPJT Nov 16, 2025
216cc4e
fix: Features
AsPJT Nov 16, 2025
3354294
fix: Sekkan
AsPJT Nov 16, 2025
15c95bd
fix: mtdna
AsPJT Nov 16, 2025
e152494
fix: error
AsPJT Nov 16, 2025
ee7ffe5
upd: stod validation
guinpen98 Nov 16, 2025
bf47884
fix: Data
AsPJT Nov 16, 2025
4486173
upd: warning対応
guinpen98 Nov 16, 2025
b58369c
ref: Date.hpp
guinpen98 Nov 16, 2025
4028ac5
fix: data
AsPJT Nov 16, 2025
56e34ad
upd: テンプレートのインスタンス化を削減
guinpen98 Nov 16, 2025
b6e7523
fix: calendar content
guinpen98 Nov 16, 2025
d7548fb
upd: AppConfig
guinpen98 Nov 16, 2025
9820edc
add: rect
guinpen98 Nov 16, 2025
8eda3c8
add: range
guinpen98 Nov 17, 2025
3ee21e0
add: WrappedScreenPositions
guinpen98 Nov 17, 2025
d958c54
ref: vector2適用
guinpen98 Nov 17, 2025
8c6032a
ref: column
guinpen98 Nov 17, 2025
0990a48
ref: rename location list
guinpen98 Nov 17, 2025
e1e97d7
fix: key
AsPJT Nov 17, 2025
19aff9d
fix: genomes.tsv
guinpen98 Nov 17, 2025
123be6c
upd: zoomフィルタリングを修正
guinpen98 Nov 17, 2025
5dc5cac
upd: 人物の非表示機能
guinpen98 Nov 17, 2025
0894426
ref: 警告を抑制
guinpen98 Nov 18, 2025
53049bb
ref: accessor
guinpen98 Nov 18, 2025
e84bc5f
ref: tsv
guinpen98 Nov 18, 2025
59af122
fix: min max size
AsPJT Nov 18, 2025
e8298d8
ref: AStar
guinpen98 Nov 18, 2025
4fe8bbd
delete: ja-JP
AsPJT Nov 18, 2025
b31d977
add: locales
guinpen98 Nov 18, 2025
f7e3bb7
fix: dxlib min max
AsPJT Nov 18, 2025
a93dfb5
upd: locales
AsPJT Nov 18, 2025
12c0893
fix: value name
AsPJT Nov 18, 2025
88f0267
fix: unittest
guinpen98 Nov 18, 2025
37c0166
fix: error
guinpen98 Nov 18, 2025
fd33e85
fix: error
guinpen98 Nov 18, 2025
de81c0b
Merge pull request #146 from AsPJT/feature/input
guinpen98 Nov 18, 2025
dbb5daa
add screenshot
AsPJT Nov 18, 2025
a283dcb
upd: locales
AsPJT Nov 18, 2025
247f1df
upd: person name locale support
guinpen98 Nov 18, 2025
94ac32f
upd: menu bar locale support
guinpen98 Nov 18, 2025
fd025d4
upd: calendar locale support
guinpen98 Nov 19, 2025
0f8e7aa
upd: debug info locale support
guinpen98 Nov 19, 2025
a3a1dbb
upd: language selector locale support
guinpen98 Nov 19, 2025
e384efc
upd: pulldown locale support
guinpen98 Nov 19, 2025
da0976c
add: en ko
AsPJT Nov 19, 2025
36ebdac
upd: feature info locale support
guinpen98 Nov 19, 2025
a3b0f55
Merge branch 'feature/locale' of github.com:AsPJT/PAX_SAPIENTICA into…
guinpen98 Nov 19, 2025
c1b4d80
add: 聖徳太子 ko-KR
AsPJT Nov 19, 2025
b5776a6
fix: person key
guinpen98 Nov 19, 2025
c1f795a
upd: Person Name
guinpen98 Nov 19, 2025
33a9824
ref: rename person names to persons
guinpen98 Nov 19, 2025
c5f661c
upd: place names
AsPJT Nov 19, 2025
65b0220
Merge branch 'feature/locale' of https://github.com/AsPJT/PAX_SAPIENT…
AsPJT Nov 19, 2025
ea67798
upd: simulation stats locale support
guinpen98 Nov 19, 2025
71581d2
upd: place name locale support
guinpen98 Nov 19, 2025
eb623ad
upd: simulation stats
guinpen98 Nov 19, 2025
e691d3c
upd: calendar units locale support
guinpen98 Nov 19, 2025
32a3b3b
ref: selected language
guinpen98 Nov 19, 2025
76a3adc
fix: isInViewBounds
guinpen98 Nov 19, 2025
1ed950c
add: loading bar
guinpen98 Nov 19, 2025
cd5f0f4
add: progress reporter
guinpen98 Nov 19, 2025
9f9c63a
ref: del backward compatibility
guinpen98 Nov 19, 2025
8593b44
add: ScopedSubscription
guinpen98 Nov 19, 2025
00d85d2
upd: app state
guinpen98 Nov 20, 2025
1eb1211
ref: mutable
guinpen98 Nov 20, 2025
6296f62
add: ApplicationEventHandler
guinpen98 Nov 20, 2025
5696538
ref: execute function
guinpen98 Nov 20, 2025
4db3ac6
add: Application class
guinpen98 Nov 20, 2025
dac074d
ref: vector2
guinpen98 Nov 20, 2025
8e93c96
upd: reserve
guinpen98 Nov 20, 2025
6b08854
fix: Line
AsPJT Nov 20, 2025
1445268
upd: domain.tsv
guinpen98 Nov 20, 2025
a83239b
add: hiragana locales simlation
AsPJT Nov 20, 2025
e6d4906
fix: marriage line
AsPJT Nov 20, 2025
cb57568
add: BOM
guinpen98 Nov 20, 2025
3794d7e
upd: initialize
guinpen98 Nov 20, 2025
7ba64f0
upd: try_emplace
guinpen98 Nov 20, 2025
80d2fb6
del: fallback
guinpen98 Nov 20, 2025
51fa4f7
ref: copy
guinpen98 Nov 20, 2025
a469081
upd: Gemone locale
AsPJT Nov 20, 2025
b58a836
upd: locale init
guinpen98 Nov 20, 2025
1ae32c4
upd: CallbackProgressReporter
guinpen98 Nov 20, 2025
04fd0f9
add: Bronze line
AsPJT Nov 20, 2025
99082e7
Merge branch 'feature/locale' of https://github.com/AsPJT/PAX_SAPIENT…
AsPJT Nov 20, 2025
d8f1c63
upd: loadAllDomains
guinpen98 Nov 20, 2025
a053e58
upd: window resize
guinpen98 Nov 20, 2025
75c206d
fix: genome
guinpen98 Nov 20, 2025
ebe0ffb
ref: cast
guinpen98 Nov 20, 2025
d1ceef8
fix: DxLib Texture
AsPJT Nov 21, 2025
5709302
upd: drag
guinpen98 Nov 22, 2025
001b5fe
upd: zoom
guinpen98 Nov 22, 2025
d6b238f
upd: Determine OS-specific
guinpen98 Nov 22, 2025
b3f58ae
fix: cmake for windows
guinpen98 Nov 22, 2025
949d40d
ref: warning
guinpen98 Nov 22, 2025
bdf9646
ref: font settings
guinpen98 Nov 22, 2025
6a26167
del: PROJECT_ROOT_PATH
guinpen98 Nov 22, 2025
563b17c
add: ReadVersion
guinpen98 Nov 22, 2025
38881df
ref: warning
guinpen98 Nov 22, 2025
e398c9d
upd: zoom range
guinpen98 Nov 22, 2025
01278d7
fix: HAinu
AsPJT Nov 22, 2025
ae9217f
ref: cmake
guinpen98 Nov 22, 2025
3530bab
ref: warning
guinpen98 Nov 22, 2025
079767e
ref: warning
guinpen98 Nov 22, 2025
81e8992
upd: vec2
guinpen98 Nov 22, 2025
b7bb7e8
ref: warning
guinpen98 Nov 22, 2025
653084b
ref: warning
guinpen98 Nov 22, 2025
08c91c0
add: PerformanceProfiler
guinpen98 Nov 22, 2025
2913dc3
fix: font
guinpen98 Nov 22, 2025
980b949
upd: map content update
guinpen98 Nov 22, 2025
c59a4b0
fix: touch
guinpen98 Nov 22, 2025
1424eac
ref: ui component
guinpen98 Nov 23, 2025
c8fa2be
ref: map contents
guinpen98 Nov 23, 2025
b36f63b
add: ISimulationProvider
guinpen98 Nov 23, 2025
5b6e495
upd: cmake
guinpen98 Nov 23, 2025
a6cecd5
ref: ui component
guinpen98 Nov 23, 2025
49706a2
ref: settlement renderer
guinpen98 Nov 23, 2025
f5ed5db
add: mutex
guinpen98 Nov 23, 2025
e53b639
upd: simulation test
guinpen98 Nov 24, 2025
134b3c5
fix: ちらつき
guinpen98 Nov 24, 2025
6d37ced
ref: settlement
guinpen98 Nov 24, 2025
4f1c504
fix: build error
guinpen98 Nov 24, 2025
4583530
add: SettlementData class
guinpen98 Nov 24, 2025
9a2ca61
fix: cmake
guinpen98 Nov 24, 2025
f0fa1de
fix: stb
guinpen98 Nov 24, 2025
82850c3
upd: for ubuntu
guinpen98 Nov 24, 2025
ba9bff5
add: ImageWriter
guinpen98 Nov 24, 2025
427d4ff
fix: STB_IMAGE_WRITE_IMPLEMENTATION
guinpen98 Nov 24, 2025
aa1ee0b
fix: ubuntu build
guinpen98 Nov 24, 2025
ee355c4
add: ExecutablePath
guinpen98 Nov 24, 2025
fe662c5
add: /bigobj
AsPJT Nov 24, 2025
2e83860
add: SFML /bigobj
AsPJT Nov 24, 2025
2fe4cd3
add: Platform
guinpen98 Nov 25, 2025
d62fec8
ref: Utility
guinpen98 Nov 25, 2025
297fd00
upd: math
guinpen98 Nov 25, 2025
38db34e
add: Calendar const
guinpen98 Nov 25, 2025
6d1b9a9
fix: 非表示の時の地物の計算を修正
guinpen98 Nov 25, 2025
8aa3f68
add: Territories
AsPJT Nov 25, 2025
154c947
fix: warning
guinpen98 Nov 25, 2025
bedb4bc
Merge pull request #147 from AsPJT/feature/locale
guinpen98 Nov 25, 2025
19f6d89
upd: TimeUtils
guinpen98 Nov 25, 2025
377817b
ref: use Math.hpp
guinpen98 Nov 26, 2025
f97fd57
fix: Temporal
guinpen98 Nov 26, 2025
740e1ae
add: daysInYearJulian
guinpen98 Nov 26, 2025
def98aa
upd: Spline2D
AsPJT Nov 26, 2025
866c6aa
fix: Siv3D
AsPJT Nov 26, 2025
2d74cf3
Merge branch 'feature/map' of https://github.com/AsPJT/PAX_SAPIENTICA…
AsPJT Nov 26, 2025
aed7350
fix: territory feature
AsPJT Nov 26, 2025
6203327
fix: Territories
AsPJT Nov 26, 2025
87c302d
upd: calendar
guinpen98 Nov 26, 2025
59b66eb
add: ToggleButton
AsPJT Nov 26, 2025
5e04b87
fix: EPSG4326_WGS84
AsPJT Nov 26, 2025
cc44d5f
add: mutable
guinpen98 Nov 26, 2025
2f27889
fix: warning
AsPJT Nov 26, 2025
afa6e50
fix: Web Mercator
AsPJT Nov 26, 2025
ac67a9c
fix: toggle button
guinpen98 Nov 26, 2025
d5d446e
ref: Linux
guinpen98 Nov 26, 2025
bd2d811
fix: Web Mercator
AsPJT Nov 26, 2025
7d085fd
fix: EPSG:3857
AsPJT Nov 26, 2025
ee68e09
fix: delete 85.051129
AsPJT Nov 26, 2025
6706e29
ref: Coordinate
guinpen98 Nov 26, 2025
4aa8bd1
add: flow curve data
AsPJT Nov 27, 2025
f266013
add: flow curve
AsPJT Nov 27, 2025
e922eef
upd: flow curves data
AsPJT Nov 27, 2025
ddab726
Initial plan
Copilot Nov 27, 2025
069e566
Reorganize test files to match Library directory structure
Copilot Nov 27, 2025
07dd62f
Merge pull request #149 from AsPJT/feature/map
guinpen98 Nov 27, 2025
50133b3
Merge pull request #148 from AsPJT/copilot/sync-unit-tests-with-library
guinpen98 Nov 27, 2025
e03dd28
fix: ProjectionUnitTest
guinpen98 Nov 27, 2025
06b05f6
add: agricultural_capable
AsPJT Nov 28, 2025
c9fe381
del: menu_bar_map_bool
guinpen98 Nov 29, 2025
d806e3a
add: WebMercator::fromXYZTile
guinpen98 Nov 29, 2025
622292f
fix: include
guinpen98 Nov 29, 2025
af112eb
add: sim TFR
AsPJT Nov 29, 2025
ba7ee81
upd: screen
AsPJT Nov 29, 2025
ca0b04b
upd: for Linux
guinpen98 Nov 29, 2025
1562062
add: version
AsPJT Nov 29, 2025
009b606
Revert "add: version"
AsPJT Nov 29, 2025
7522d73
upd: Version
AsPJT Nov 29, 2025
a1dd480
upd: icon buttonの視覚フィードバック
guinpen98 Nov 29, 2025
d124c5a
upd: en-US data
AsPJT Nov 29, 2025
c16e6f8
upd: Invoke IconButton::handleEvent(event)
guinpen98 Nov 29, 2025
dd0d8f9
Merge branch 'feature/sim-upd' of github.com:AsPJT/PAX_SAPIENTICA int…
guinpen98 Nov 29, 2025
b1d7e9a
upd: feature name
guinpen98 Nov 29, 2025
36e3da7
add: locales kofun data
AsPJT Nov 29, 2025
79c9d42
ref: デバッグ処理をコメントアウト
guinpen98 Nov 29, 2025
a63c4cd
upd: vcpkg for macOS
guinpen98 Nov 30, 2025
bf469c4
ref: JulianDayNumber
guinpen98 Nov 30, 2025
8991b82
add: map bar keys view_territory & view_flow_curve
AsPJT Nov 30, 2025
57fb2bf
add: try_get
guinpen98 Nov 30, 2025
e82e8cb
ref: delete old data
AsPJT Nov 30, 2025
ca6e455
add: SimulationUnitTest
guinpen98 Nov 30, 2025
be2beb1
Merge pull request #150 from AsPJT/feature/sim-upd
guinpen98 Dec 1, 2025
43adef3
fix: sfml build
guinpen98 Dec 1, 2025
b041bb9
fix: event
guinpen98 Dec 1, 2025
cb52469
upd: dmg
guinpen98 Dec 1, 2025
4a39f9e
fix: link error
guinpen98 Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebug/*
[Dd]ebugPublic/
!Library/**/Debug/
[Rr]elease/
[Rr]eleases/
x64/
Expand Down Expand Up @@ -273,6 +274,7 @@ TestMap/
SavedMap/
*.exe
AS_DEBUG/
Intermediate/

.DS_Store
.vscode
Expand All @@ -285,3 +287,7 @@ DevelopmentBuild/
ProductionBuild/
SimulationResults/
LabeledSimulationResults/

# vcpkg
vcpkg/
vcpkg_installed/
248 changes: 0 additions & 248 deletions Data/Character/KanaAndRomajiConversion.tsv
View file
Open in desktop

This file was deleted.

Loading