Commit Graph

291 Commits

Author SHA1 Message Date
Aotumuri c78ff36dcb fixed 2025-06-02 20:51:08 +09:00
Aotumuri 7701fcd3b1 fix 2025-06-02 17:58:13 +09:00
Aotumuri 938e8b71a6 fixed 2025-06-01 21:51:45 +09:00
Aotumuri cfacf8b0e2 fixed 2025-06-01 21:01:54 +09:00
Aotumuri cec50b458c fixed 2025-06-01 19:43:44 +09:00
Aotumuri 97694b449d add txt 2025-06-01 17:09:41 +09:00
Aotumuri 4334e50576 fixed name 2025-06-01 17:07:56 +09:00
Aotumuri 02ca9c2c6f fixed 2025-06-01 14:04:57 +09:00
Aotumuri d2dab95bae removed test 2025-06-01 11:05:50 +09:00
Aotumuri 8e3d24509d fixed 2025-06-01 11:00:22 +09:00
Aotumuri 618c43113b add setting 2025-06-01 08:35:44 +09:00
Aotumuri b55241a295 Merge branch 'main' into patterned-territory 2025-06-01 08:05:32 +09:00
Mason Schmidgall 5b1577ea37 Update HeadsUpMessage.ts to support translations (#981)
## Description:

This change fixes the spawn message to use `translateText()`. I'll
ensure I don't miss this again.


![image](https://github.com/user-attachments/assets/76868b1c-701d-4035-bc55-34f3635ecf06)

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

.spicydll
2025-05-31 14:55:45 -07:00
Aotumuri 9ced00ff83 Merge branch 'main' into patterned-territory 2025-05-31 21:09:00 +09:00
VariableVince a0e00e1fb0 Even more flag flair (#959)
## Description:

Add Sakhalin flag for nation on Japan map. Use Aztec flag for Biggest
Snakes nation. Change 'Jesuit Monks' nation into 'Tamazgha' with
corresponding flag. Thanks @ N0ur and J. Dimlight

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

tryout33
2025-05-30 13:25:07 -07:00
Duwibi f6687302c6 Fix map jsons (#960)
## Description:
Quite a bit of maps have problems with their jsons. In this PR, I'll try
to fix some of them.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

<DISCORD USERNAME>
Nikola123
2025-05-30 12:50:25 -07:00
VariableVince d61efdc1de Flag fixes in several maps (#957)
## Description:

Thanks to J.Dimlight for reporting this.

Flag images were not displayed on maps. Or the wrong flag was displayed.
Because of no flag code, or pointing to non-existant or incorrect flag
file names.

There are currently no flags to display for these Nations, as there is
no flag file present in resources:

Gateway to the Atlantic
- Jesuit Monks
- Wine

Japan and Neighbors:
- Sakhalin

Mars:
- European Space Agency

South America:
- The Biggest Snakes
- Normal Capybaras
- Just Otters

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

tryout33
2025-05-30 09:52:40 -07:00
Aotumuri 534c6d5524 Merge branch 'main' into patterned-territory 2025-05-30 15:51:04 +09:00
Aotumuri 6e924c24a9 fixed 2025-05-30 14:58:00 +09:00
Drills Kibo 91b19c1f09 Add close label (#949)
## Description:
Add a label to the close button on News modal. Closes
[#947](https://github.com/openfrontio/OpenFrontIO/issues/947)

## Please complete the following:
- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:
`drillskibo`


![image](https://github.com/user-attachments/assets/35500890-a30a-4481-aa73-802152325eef)
2025-05-29 23:55:03 -04:00
evanpelle be2e64c85c put meta changes in news modal 2025-05-29 19:18:34 -07:00
evanpelle 682918732a remove ads.txt 2025-05-29 17:19:55 -07:00
evanpelle 5e7bfb2708 add steam wishlist link on win modal 2025-05-29 11:33:42 -07:00
evanpelle 535df61ffd add robots.txt 2025-05-29 11:07:04 -07:00
evanpelle 24183412f9 add advertisement on site link 2025-05-29 09:52:51 -07:00
evanpelle 46252176d8 update privacy policy for playwire ads 2025-05-29 09:34:27 -07:00
Aotumuri 7f4e127c14 Merge branch 'main' into patterned-territory 2025-05-29 06:22:10 +09:00
evanpelle 6e6fb2db3a remove known world (#914)
## Description:
Remove known world map to avoid copyright infringement.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

<DISCORD USERNAME>
2025-05-27 20:08:15 -07:00
Lucas 0a37fa5a21 Add Github Logo on footer (#875)
## Description:

Logo github added on footer (white and dark logos added in
ressources/static/icons)

## Please complete the following:

Resolves: #791

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

discord: _noyle

![screenshot-20250525-105758](https://github.com/user-attachments/assets/ff399af8-ef03-4e73-8c9b-3a31752b0ebd)

---------

Co-authored-by: tnhnblgl <51187395+tnhnblgl@users.noreply.github.com>
Co-authored-by: evanpelle <evanpelle@gmail.com>
2025-05-27 19:54:35 -07:00
VariableVince d8ad9e23bd Flag fixes for Europe map and for Brittany in flag menu and Gateway To the Atlantic map (#910)
## Description:

As reported here
https://discord.com/channels/1284581928254701718/1377035663404433490

Flag names in Europe.json didn't correspond with those in Countries.json
for: England, Scotland, Wales. So the Nations' flags weren't displayed
in-game. Changed them in Europe.json.

The flag of Brittanny was looked up as 'britanny' by both the flag menu
and GatewayToTheAtlantic.json. Changed its name in Countries.json to
correspond with this so the flag shows up in flag menu and in-game.

## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

tryout33
2025-05-27 19:13:38 -07:00
Duwibi 30271306b1 Fix Toki Pona (#898)
## Description:
Fixes the Toki Pona language so it shows the right flag, aswell as show
the translations instrad of debug

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

<DISCORD USERNAME>
Nikola123
2025-05-27 16:44:30 -04:00
Aotumuri 9a49ece77c mls (#888)
## Description:
mls for v23
Version identifier within MLS: v3.2

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

aotumuri

---------

Co-authored-by: Duwibi <86431918+Duwibi@users.noreply.github.com>
Co-authored-by: evanpelle <evanpelle@gmail.com>
2025-05-27 09:50:22 -07:00
DevelopingTom e8834e15e6 Add naval combat animations (#858)
## Description:


https://github.com/user-attachments/assets/b46f949a-eb50-4656-8492-216cf820ac46

Add a couple animations for naval combat:

- shell hit
- ship explosion
- ship sinking

Added a simple `Timeline` class to spread FX animations over time.
Added a `ColoredAnimatedSprite` similar to the existing `ColoredSprite`.
Refactored the latter to avoid code duplication.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

IngloriousTom
2025-05-26 19:59:11 -04:00
tnhnblgl 1994f06722 Proper alliance timer naming (#886)
## Description:
Now it's just Time Remaining, the remaining time for what is unknown.

Alliance Expires In
Timer

Would be better
## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:
dovg
2025-05-26 16:07:43 -04:00
Aotumuri c6e8f2f998 mls4error (#869)
## Description: 
I will implement MLS support for the error messages.
![スクリーンショット 2025-05-25 8 32
29](https://github.com/user-attachments/assets/90ceabe0-e12f-49e4-897a-a452f0949df3)


## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors
2025-05-24 20:13:59 -04:00
1brucben 08216855f7 Add Giant World Map (#845)
## Description:
Adds giant world map. Uses same nations as former world map. Does not
include translations beyond English.
## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

1brucben

---------

Co-authored-by: evanpelle <evanpelle@gmail.com>
2025-05-23 22:26:01 -04:00
Scott Anderson c30839b12b Better login handling (#855)
## Description:

- Display "Checking login..." while waiting for the API server to
respond to our profile lookup request.
- Set the client to logged out if any of the API calls fail.
- Fix a bug causing the client to send a JWT even if the API server was
down.

Closes #824


![image](https://github.com/user-attachments/assets/d6413489-b6af-43b5-be8a-676142697495)

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
2025-05-23 16:54:26 -07:00
tnhnblgl 773c9566fc Display betrayal count (Continue #744) (#849)
## Description:
. #744 became a mess. Rewrote it


![Screenshot](https://github.com/user-attachments/assets/0e43547f-514a-4e93-9bbc-d022d8dfb75c)

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:
dovg
2025-05-23 17:14:57 -04:00
DevelopingTom 7520bc8352 Add ruins and desolation FX on nuke explosions (#847)
## Description:

Add a few animations after a nuke exploded:
- small fire
- big fire
- small smoke
- big smokes


https://github.com/user-attachments/assets/6ef7c1e3-ae3e-4420-aab2-3a3a3630ad98

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

IngloriousTom
2025-05-22 19:27:07 -04:00
Aotumuri 06bdd0ac52 Merge branch 'main' into patterned-territory 2025-05-23 07:59:39 +09:00
DevelopingTom 85c03d659c Add SAM interception FX (#830)
## Description:
Add SAM interception animation:


https://github.com/user-attachments/assets/5bfae4f2-f040-41cb-8fba-790538091807

Previously an intercepted nuke detonated with the regular nuke
explosion, which was confusing.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

IngloriousTom
2025-05-22 17:11:31 -04:00
Aotumuri 5533ba7eab Merge branch 'main' into patterned-territory 2025-05-22 20:20:46 +09:00
Aotumuri 18e35400a3 base64 2025-05-22 20:15:04 +09:00
Aotumuri aad1f63776 base64 2025-05-22 17:18:53 +09:00
Greymald ac47889938 add rivers to pangea (#840)
## Description:
improve map pangea (adding rivers)

## Please complete the following:
before :
![Capture d'écran 2025-05-21
221947](https://github.com/user-attachments/assets/c18adf6e-2e48-41be-9e16-5dc4ff9d9a43)

after :
![Capture d'écran 2025-05-21
221853](https://github.com/user-attachments/assets/8d5b05fc-1b5e-46c6-99ba-db3d21defccd)


<napnap>
2025-05-21 15:55:15 -07:00
Aotumuri 4f05558066 Merge branch 'main' into patterned-territory 2025-05-20 12:44:24 +09:00
tnhnblgl ca66656b5c Display alliance timer in player panel (#805)
## Description:
Below Traitor: , There will be Alliance Status. And will display timer,
after timer ends will show Alliance Expired. Also this Alliance Status
will only show if player had alliance.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:
dovg
2025-05-19 15:29:40 -07:00
VariableVince 866ff7c487 Rename helpModal images so CDN cache is refreshed on commit (#810)
## Description:

Overwritten images (same file name) from PR
https://github.com/openfrontio/OpenFrontIO/pull/785 took more than a day
to all be shown in Instructions (helpModal) on .dev. Prevent this from
happening on commit to prod by renaming them.

There's talk about cache busting but that isn't implemented (yet) for
now.

Two of the 7 renamed ones:

![afbeelding](https://github.com/user-attachments/assets/71f95659-71ce-4504-9b21-bd02e67c0786)


## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

tryout33
2025-05-18 14:13:25 -07:00
Duwibi 4f2442ff59 Update Halkidiki.json (#809)
## Description:
Fixed wording in Halkidiki.json

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

<DISCORD USERNAME>
Nikola123
2025-05-18 16:17:08 -04:00
DevelopingTom bb24f18285 Add new FX layer and a nuke animation (#807)
## Description:

Changes:
- Added an AnimatedSprite class to handle spritesheets
- New FX layer, displaying cosmectics effects
- New Nuke FX: an animated sprite explosion, and a shockwave effect
- New "Special effects" setting, toggle to deactivate the FX layer for
lower-end hardware / personal taste


#### Note that the animation is a placeholder. It should be replaced
when a better looking one is available.

- Nuke:


https://github.com/user-attachments/assets/6eff1d0d-5081-47ad-932f-2bfcda72cb3c


- Mirv:


https://github.com/user-attachments/assets/3bc891b4-449c-4acb-8e24-e237b423c2a9


- SAM are also using the same Nuke animation. To be improved with a
custom FX:


https://github.com/user-attachments/assets/d65addce-5890-42c2-81e0-3eaa79ed87f3

## Performances:

Excellent since it's not manipulating the underlying imagedata directly.
Profiling during a MIRV with 100's of animations:

![image](https://github.com/user-attachments/assets/3477c963-d10f-493b-bcb1-93b7990d3edb)



### New settings:

- main menu:


![image](https://github.com/user-attachments/assets/5b1127bb-3b89-4c06-b519-fb173301d9fd)

- In game:


![image](https://github.com/user-attachments/assets/ba899253-a7cf-4d1c-8801-da41d2b1536b)


## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

IngloriousTom
2025-05-18 12:43:12 -07:00