Commit Graph

563 Commits

Author SHA1 Message Date
Evan d9f2b683d7 add eq for zoom, chagne meta give more bonus large players, don't throw exception when attack self 2025-02-15 14:31:18 -08:00
evanpelle 68fef55599 Merge pull request #32 from NewHappyRabbit/flags
Fixed flag modal CSS for mobile
2025-02-14 08:03:33 -08:00
NewHappyRabbit 42ca32d390 Fixed flag modal CSS for mobile 2025-02-14 10:54:29 +02:00
Evan f2d50a79b8 capitalize yes/no on traitor display 2025-02-13 15:36:41 -08:00
Evan 9dc326e06a rename intense difficulty => impossible 2025-02-13 11:51:25 -08:00
NewHappyRabbit 115e40916b Flag button turned into toggle to show/hide flags modal. 2025-02-13 18:11:18 +02:00
NewHappyRabbit 60e74b75bb Merge branch 'main' of https://github.com/openfrontio/OpenFrontIO 2025-02-13 14:43:23 +02:00
Evan bba7f6f0e5 bugfix: allow click on events display 2025-02-12 20:36:26 -08:00
Evan 74bdae1ce7 increase max zoom out for mobile 2025-02-12 20:29:27 -08:00
Evan 421c6e7841 use tileref instead of MapPos for UnitUpdate 2025-02-12 16:22:02 -08:00
NewHappyRabbit aab9c05865 Merge remote-tracking branch 'upstream/main' 2025-02-12 22:55:46 +02:00
NewHappyRabbit 9de6f6d1e2 Forgot to prettier... 2025-02-12 22:54:59 +02:00
NewHappyRabbit 27173092cf Changed the flags to a more cartoony/emojiy? version (Thanks Nour!).
Removed coalitions from the countries.json file.
Seperated the flag from the name input.
2025-02-12 22:53:33 +02:00
Evan f448785476 have client stop polling for public servers after game starts 2025-02-12 12:08:50 -08:00
Evan eae53b29cb change flag top margin a bit 2025-02-12 11:59:07 -08:00
Evan ea08856636 fix merge conflict: put / in flag path 2025-02-12 11:48:25 -08:00
Evan 87135d6da2 style flags: make them smaller and put under name 2025-02-12 11:47:15 -08:00
evanpelle 9ee1a94b10 Merge pull request #28 from NewHappyRabbit/SPA
Private lobby urls added. Server now acts as a SPA.
2025-02-12 11:45:54 -08:00
NewHappyRabbit e0aa6b5d9c Ran prettier 2025-02-12 21:30:43 +02:00
Evan 3639997f05 make bot names gray instead of bot emoji 2025-02-12 11:29:49 -08:00
NewHappyRabbit 303543d246 Lobby urls! Server will server index.html and act as a SPA. 2025-02-12 21:18:23 +02:00
Evan a478e305d1 fix right click bringing up context menu instead of radial menu on bottom of screen 2025-02-12 10:33:08 -08:00
Evan a8c04f11ee bugfix: emoji button to send to all players always active, shorten emoji cooldown 2025-02-12 10:24:32 -08:00
NewHappyRabbit e1a6c5f7bd Merge branch 'main' of https://github.com/openfrontio/OpenFrontIO into SPA 2025-02-12 20:03:26 +02:00
Evan 00102972e6 fix index.html from bad merge 2025-02-12 08:55:26 -08:00
Evan 40966ca3b9 format all files with prettier 2025-02-12 08:28:15 -08:00
evanpelle a30079ac94 Merge pull request #27 from NewHappyRabbit/main
Fixed countries.json. Fixed flag container overflowing.
2025-02-12 08:22:52 -08:00
evanpelle bcc9e57b13 Merge branch 'main' into svg-logo 2025-02-12 08:18:31 -08:00
evanpelle 57946566df Merge pull request #25 from q8gazy/Non-host-see-lobby-players
non-host player can see who's in the lobby
2025-02-12 08:13:41 -08:00
evanpelle 8532b02bbd Merge pull request #23 from q8gazy/fix-control-panel
fix control-panel size
2025-02-12 08:12:19 -08:00
NewHappyRabbit de01f322ac Merge branch 'main' of https://github.com/openfrontio/OpenFrontIO 2025-02-12 16:51:39 +02:00
NewHappyRabbit e67a07a894 Updated countries.json and added continents to each country (could be used somewhere later on?).
Fixed flag container overflowing.
2025-02-12 16:27:53 +02:00
q8gazy 88f960b4a5 add svg logo with styling 2025-02-12 17:17:42 +03:00
q8gazy 13205ec92e non-host player can see who's in the lobby 2025-02-12 13:46:17 +03:00
q8gazy fc6cd43ed6 fix control-panel size 2025-02-12 10:42:14 +03:00
q8gazy 9c0c5b667c styling the checkboxes 2025-02-12 08:51:27 +03:00
Evan 2ca6c6d04c fix compile error from bad merge 2025-02-11 21:14:59 -08:00
evanpelle 5051096b57 Merge pull request #16 from q8gazy/ui/modal-overlay-improvements
modal overlay improvements
2025-02-11 21:04:51 -08:00
Evan c7847e4e44 update atack meta: don't give such large bonus for large attacks 2025-02-11 20:38:26 -08:00
Evan 95a70dd8d3 bugfix: names flash at corner at start of game 2025-02-11 20:02:34 -08:00
q8gazy b691d7f771 Merge branch 'main' into ui/modal-overlay-improvements 2025-02-12 06:58:36 +03:00
q8gazy a3c1f2a2c5 fix 2025-02-12 06:53:42 +03:00
Evan c3a5e58be6 add zoom and pan keyboard shortcuts 2025-02-11 18:01:26 -08:00
Evan 91ca03aff8 style top bar 2025-02-11 16:28:13 -08:00
NewHappyRabbit 7be0b9bc65 quickfix 2025-02-12 02:08:56 +02:00
NewHappyRabbit 1e1942ab1c TODO: Keep working 2025-02-12 02:08:29 +02:00
evanpelle 68433e34a3 Merge pull request #20 from NewHappyRabbit/main
Fixed countries.json codes to be lowercase
2025-02-11 15:11:39 -08:00
NewHappyRabbit 894ad77ede Updated countries.json codes to be lowercase 2025-02-12 01:09:54 +02:00
evanpelle 58c2895826 Merge pull request #19 from NewHappyRabbit/main
Added creative mode. Buildings are free, build instantly and you start with 100k population. Bots now have an emoji in their name
2025-02-11 14:30:34 -08:00
NewHappyRabbit a58c3c7198 Added robot emoji prefix to bot and npc names 2025-02-12 00:29:16 +02:00