Commit Graph

1603 Commits

Author SHA1 Message Date
1brucben 4c4646aadb fix bot teams 2025-05-06 01:35:51 +02:00
1brucben b87cdd04cf finish merge 2025-05-06 01:15:49 +02:00
1brucben 6ca8809556 Merge branch 'main' into meta3 2025-05-06 01:13:38 +02:00
Scott Anderson 8479fab49d Add logout button (#653)
## Description:

- Add a logout button, and post to the `/logout` endpoint to end the
session server-side.
- Add an option to log out all sessions by calling the `/revoke`
endpoint. There is button for this yet.
- Depends on https://github.com/openfrontio/infra/pull/32
- This is the last part of #559

## 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-05 15:48:12 -07:00
1brucben 3e6afb93cd version number 2025-05-06 00:15:15 +02:00
1brucben 23b13971c6 strengthen dogpile 2025-05-06 00:12:08 +02:00
1brucben f676a6e0f7 flag fix and speed up 2025-05-06 00:09:22 +02:00
1brucben fe27f0f106 flag update 2025-05-05 22:42:58 +02:00
1brucben f862ad36df dogpile fix again 2025-05-05 22:28:24 +02:00
1brucben 82a5f1795c dogpile fix 2025-05-05 21:27:05 +02:00
evan c97eca0ed2 double the player count of team games (max 150), and do 3:1 ffa:team ratio 2025-05-05 11:23:29 -07:00
evan cea6e0bc11 update & refactor MapPlaylist: remove big/small map distinction, ensure no map is repeated within 5 rounds, update how map is shuffled 2025-05-05 10:55:53 -07:00
Aotumuri 29076f84c5 fixed team count (#654)
## Description:
fixed .w.

<img width="541" alt="スクリーンショット 2025-05-05 11 22 34"
src="https://github.com/user-attachments/assets/4c324d64-a9cd-44a8-a72b-2465849303c9"
/>

## 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
2025-05-05 09:14:55 -07:00
Scott Anderson 5d828f7d42 Add a new apiHost configuration for local development (#655)
## Description:

Allow developers to override the API base.

## 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-05 09:13:53 -07:00
Aotumuri 7092e9c166 Added keybinding configuration. (#548)
## Description:
Added support for customizable keybind settings.

fixes #549

fixed these bug
https://discord.com/channels/1284581928254701718/1363254158341308668
https://discord.com/channels/1284581928254701718/1362159209642459166

## 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
2025-05-05 08:40:52 -07:00
1brucben e3052546c5 nations attack terra nulla first. 2025-05-05 02:13:53 +02:00
Aotumuri 3d3f1261e9 display team count (#648)
## Description:
I added a display for the number of teams in public lobbies.
![スクリーンショット 2025-05-04 20 59
02](https://github.com/user-attachments/assets/ab24de77-fcac-4c2d-b272-2bc3ce29187f)
## 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
2025-05-04 13:25:50 -07:00
1brucben 0967b4bc3a bot team fix 2025-05-04 22:07:51 +02:00
evanpelle 50b417d0fd update countries.json (#651)
## Description:
Update countries.json, remove duplicate flags, fix flags
## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [ ] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [ ] 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>

---------

Co-authored-by: evan <openfrontio@gmail.com>
2025-05-04 11:17:04 -07:00
evan 1f474a368c add footer link to privacy policy and terms of service 2025-05-02 19:43:49 -07:00
Loymdayddaud f700c53154 change team order to Red, Blue, Yellow, Green, Teal, Orange, Purple (#615)
## Description:
Changes the team order to Red, Blue, Yellow, Green, Orange, Purple, Teal
instead of what it originally was (Red, Blue, Teal, Purple, Yellow,
Orange, Green)
Teal and Blue look similar, so I think it's better to move them further
apart. Instead, the primary colors are chosen first.
Fixes #614

In the long run, I think it would be nice to have the teams randomly
chosen from available colors and not always in the same order - e.g. a
three-team game isn't always Red, Blue, and Yellow, it could be any mix
of the colors. However, my programming skills aren't great enough to do
that.

## 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:
Spartan Oligarchy/Loymdayddaud
2025-05-02 14:01:10 -07:00
Scott Anderson 0ec2f053d0 Precompute tile coordinate LUT (#639)
## Description:

Precompute div/mod operations and store them in a lookup table.

## 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-02 13:19:42 -07:00
evan 8bdda67b2a disable remote logging and metrics on dev & staging to reduce load on monitoring stack 2025-05-02 12:53:48 -07:00
evan 8c20e1f690 remove master metrics, we'll be using node exporter instead for system info 2025-05-02 12:25:55 -07:00
Scott Anderson d6b100108a JWT refresh (#636)
## Description:

Implement refresh for JWTs.

Related to https://github.com/openfrontio/infra/pull/26

## 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-02 12:02:53 -07:00
evan 0dd762e3a8 change worker metrics to guage 2025-05-02 08:45:52 -07:00
evan d24a3ddcec don't allow building units during spawn phase 2025-05-02 08:01:15 -07:00
PilkeySEK ebc9e4877d Fix emoji exploit (#640)
## Description:
This should fix the exploit that allows players to send custom text as
an "emoji". It does this by introducing a emoji ID (index into the emoji
table) instead of sending the raw emoji as a string.

## 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:
PilkeySEK
2025-05-02 07:37:29 -07:00
Scott Anderson b56764ce57 Update JWT schema (#632)
## Description:

- Handle the new `sub` encoding
- Decode the new `rol` claim
- Related to https://github.com/openfrontio/infra/pull/25

## 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-01 12:22:20 -07:00
1brucben 425d0166f4 adjustments 2025-05-01 20:45:16 +02:00
evanpelle ffc2fadc20 use otel for observability (#635)
## Description:

## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [ ] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [ ] 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>

Co-authored-by: evan <openfrontio@gmail.com>
2025-05-01 11:22:56 -07:00
evan 4852ada7f3 show team in player overlay panel 2025-04-30 14:39:06 -07:00
evan 491ad109da in spawn phase highligh player as green if on the same team 2025-04-30 14:09:51 -07:00
evanpelle d6a412aa50 implement duos (#630)
## Description:
Implement Duos team mode.
Also assign teams to nations at the start instead of assigning them
randomly on spawn. This gives more consistent team sizes

## 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>

Co-authored-by: evan <openfrontio@gmail.com>
2025-04-30 13:47:35 -07:00
evanpelle 1bdcc618b7 update countries.json (#624)
## Description:

Update countries.json

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [ ] 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>

Co-authored-by: evan <openfrontio@gmail.com>
2025-04-30 10:41:17 -07:00
Scott Anderson 1070a7cb0f JWT decoding with jose (#617)
## Description:

- Decode JWT with jose, and manually verify claims.
- Unfortunately, chrome isn't able to verify EdDSA signatures, so we
can't use the simpler `jwtVerify` jose function, which would verify
claims for us.
- Use the persistent_id from the JWT.


![image](https://github.com/user-attachments/assets/f3561311-0264-48f7-8173-e7f98c3b581e)

## 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:

fake.neo

---------

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
2025-04-30 10:17:44 -07:00
evan 41f5faf34c re-enable donation in ffa 2025-04-29 19:28:21 -07:00
Samuel Safahi e0cbbf0173 Add Duration to Defense Debuff Messages (#603)
## Description:

This PR updates the in-game defense debuff message to include the
**duration** of the effect, improving clarity and usability during
gameplay.

### Change Summary:
- Updated static text to:  
`You broke your alliance with United States, making you a TRAITOR (50%
defense debuff for 30 secs)`
- Improves player understanding of how long penalties last.
- Aligns with other UI efforts focused on real-time feedback and clearer
mechanics.
- Sets a standard for future status/debuff messages to include duration
info where relevant.

This small but high-impact change enhances the player experience,
especially in intense or competitive matches where timing matters.

---

## 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:

**@walker9607**


Resolves issue
https://github.com/openfrontio/OpenFrontIO/issues/602#issue-3018752308
2025-04-29 17:21:18 -07:00
evanpelle cc9b1a305b add link to tournament (#621)
## Description:

## 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>

Co-authored-by: evan <openfrontio@gmail.com>
2025-04-29 13:22:29 -07:00
evan 84b5545c5b remove DiscordBot.ts, since this will be handled in a seperate service 2025-04-29 09:58:59 -07:00
Scott Anderson cb9a97083a Discord login (#611)
## Description:

## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [ ] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [ ] 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>

---------

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
2025-04-28 18:31:42 -07:00
evan a36fdcaaed re-enable stacking 2025-04-28 15:18:50 -07:00
Duwibi ccba7a5617 Add Antarctica Map (#544)
## Description:
This PR adds the new Deglaciated Antarctica map(suggested by Backn). It
has 9 nations - most of the country territorial claims on the continent
and the "Penguin Empire".

fixes #545 

## 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:

Nikola123

---------

Co-authored-by: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com>
2025-04-28 12:58:10 -07:00
evan 94e828e408 use environment variable to store R2_BUCKET 2025-04-28 09:54:04 -07:00
evan 8e8df5c308 bugfix: make sure not to add TerraNullius as enemy in BotBehavior as the causes a crash when checking isFriendly 2025-04-28 09:53:07 -07:00
Scott Anderson 96c8429a16 Shuffle playlist order (#612)
## Description:

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [ ] 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:

fake.neo

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
2025-04-28 09:17:13 -07:00
evan eed489a551 bugfix: make sure to add teams before assigning players, this caused all team games to have only two teams 2025-04-27 20:39:24 -07:00
Tom 42b6a649ce Use monospace font for private lobby code input (#566)
## Description:
Changes private lobby code input font to be monospace. Parity with lobby
creation screen (#438).

**Before:**

![image](https://github.com/user-attachments/assets/da25cf2c-a8df-4d62-86ae-1eb575ad7bac)

**After:**

![image](https://github.com/user-attachments/assets/a65a0ff8-d48e-4c38-a949-8cc0fc82d383)


## 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:

imdarktom
2025-04-27 17:10:56 -07:00
1brucben 5228371e9f slowed attack speed 2025-04-28 00:19:40 +02:00
1brucben e2a25d53d7 calibration 2025-04-27 23:43:14 +02:00