Skip to content

Commit 6a4d775

Browse files
Merge branch 'main' into canbuildtransport-perf
2 parents 9d01862 + 935ff7a commit 6a4d775

File tree

93 files changed

+3311
-878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+3311
-878
lines changed

CREDITS.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Credits
2+
3+
## Code
4+
5+
OpenFront is licensed under AGPL-3.0.
6+
See [Contributors](https://github.com/openfrontio/OpenFrontIO/graphs/contributors) for code contributors.
7+
8+
## Map Data
9+
10+
### OpenStreetMap
11+
12+
© [OpenStreetMap contributors](https://www.openstreetmap.org/copyright)
13+
Licensed under ODbL
14+
15+
### Natural Earth
16+
17+
[Natural Earth](https://www.naturalearthdata.com/)
18+
Public Domain
19+
20+
### Bedmap3 Antarctica Dataset
21+
22+
Pritchard, H.D., Fretwell, P.T., Fremand, A.C. et al. Bedmap3 updated ice bed, surface and thickness gridded datasets for Antarctica. _Sci Data_ 12, 109 (2025).
23+
[https://doi.org/10.1038/s41597-025-04672-y](https://doi.org/10.1038/s41597-025-04672-y)
24+
Licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)
25+
26+
## Icons
27+
28+
Icons from [The Noun Project](https://thenounproject.com/)

jest.config.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ export default {
1111
},
1212
transform: {
1313
"^.+\\.tsx?$": ["@swc/jest"],
14+
"^.+\\.mjs$": ["@swc/jest"],
15+
"^.+\\.js$": ["@swc/jest"],
1416
},
15-
transformIgnorePatterns: ["node_modules/(?!(node:)/)"],
17+
transformIgnorePatterns: [
18+
"node_modules/(?!(nanoid|@jsep|fastpriorityqueue|@datastructures-js)/)",
19+
],
1620
collectCoverageFrom: ["src/**/*.ts", "!src/**/*.d.ts"],
1721
coverageThreshold: {
1822
global: {
19-
statements: 21.5,
23+
statements: 21,
2024
branches: 16,
2125
lines: 21.0,
2226
functions: 20.5,
2.16 MB
Loading
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "Baikal (Nuke Wars)",
3+
"nations": []
4+
}
1.06 KB
Loading

map-generator/assets/maps/montreal/info.json

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,75 @@
33
"nations": [
44
{
55
"coordinates": [800, 430],
6-
"flag": "ca",
6+
"flag": "quebec",
77
"name": "Laval",
88
"strength": 2
99
},
1010
{
1111
"coordinates": [1110, 930],
12-
"flag": "ca",
13-
"name": "Montreal",
14-
"strength": 2
12+
"flag": "quebec",
13+
"name": "Royal Mount park",
14+
"strength": 1
1515
},
1616
{
1717
"coordinates": [1220, 1360],
18-
"flag": "ca",
18+
"flag": "quebec",
1919
"name": "Hochelaga Archipelago",
2020
"strength": 2
21+
},
22+
{
23+
"coordinates": [1080, 980],
24+
"flag": "ca",
25+
"name": "Westmount",
26+
"strength": 1
27+
},
28+
{
29+
"coordinates": [1400, 1000],
30+
"flag": "quebec",
31+
"name": "Saint-Lambert",
32+
"strength": 1
33+
},
34+
{
35+
"coordinates": [500, 130],
36+
"flag": "quebec",
37+
"name": "Blainville",
38+
"strength": 1
39+
},
40+
{
41+
"coordinates": [350, 650],
42+
"flag": "quebec",
43+
"name": "Saint-Eustache",
44+
"strength": 1
45+
},
46+
{
47+
"coordinates": [200, 1350],
48+
"flag": "quebec",
49+
"name": "Perrot Island",
50+
"strength": 1
51+
},
52+
{
53+
"coordinates": [25, 950],
54+
"flag": "quebec",
55+
"name": "Kanesatake Lands",
56+
"strength": 1
57+
},
58+
{
59+
"coordinates": [50, 450],
60+
"flag": "quebec",
61+
"name": "Mirabel",
62+
"strength": 1
63+
},
64+
{
65+
"coordinates": [650, 1450],
66+
"flag": "quebec",
67+
"name": "Chateauguay",
68+
"strength": 1
69+
},
70+
{
71+
"coordinates": [1330, 300],
72+
"flag": "quebec",
73+
"name": "Pointe-aux-Trembles",
74+
"strength": 1
2175
}
2276
]
2377
}

map-generator/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var maps = []struct {
1818
{Name: "australia"},
1919
{Name: "achiran"},
2020
{Name: "baikal"},
21+
{Name: "baikalnukewars"},
2122
{Name: "betweentwoseas"},
2223
{Name: "blacksea"},
2324
{Name: "britannia"},
436 Bytes
Loading
280 Bytes
Loading
330 Bytes
Loading

0 commit comments

Comments
 (0)