Commit graph

27358 commits

Author SHA1 Message Date
toaster
c9651f92af Grab a certain prize from a random Prison Egg
Extra word added because the newline situation sucks
2024-04-14 23:38:28 +01:00
toaster
6df31e96f0 M_BuildConditionString: Fix invalid conjunction behaviour
- Nothing except DescriptionOverride will prevent an `- OR ` being inserted
- Question marks for further secret types won't prevent alternate conditions from showing up
2024-04-14 21:33:45 +01:00
toaster
39d701359a The "(Find other secrets to learn about this...)" text only happens if it's at the start of the challenge, otherwise it does "???" as before
Least need to go over and check every challenge description again
2024-04-14 21:16:32 +01:00
Oni
f29ed06e92 Merge branch 'fix-opengl-intro' into 'master'
Legacy GL: hack to fix blank screen once "kartkrew.org" and "2013 - 11 years - 2024" text appears

Closes #1207

See merge request KartKrew/Kart!2284
2024-04-14 17:14:40 +00:00
Sal
9964d022f7 Merge branch 'prisons-reset' into 'master'
Fix Battle not resetting to Prisons when the server empties to 1P

Closes #1277

See merge request KartKrew/Kart!2280
2024-04-14 17:10:49 +00:00
SteelT
76b356f7b3 README.md: Remove libfmt from list of required libs
Source-vendored libfmt is now always used regardless of platform
2024-04-14 13:05:37 -04:00
Eidolon
5e316f5364 Merge branch 'use-thirdparty-fmt' into 'master'
(Ubuntu fix) use libfmt from thirdparty/fmt

Closes #1278

See merge request KartKrew/Kart!2283
2024-04-14 16:39:02 +00:00
Eidolon
e9744823f6 Remove fmt from vcpkg.json 2024-04-14 11:15:30 -05:00
James R
56b142e737 Legacy GL: hack to fix blank screen once "kartkrew.org" and "2013 - 11 years - 2024" text appears 2024-04-14 00:59:28 -07:00
Sal
45583b1944 Merge branch 'emeraldnum-restrict' into 'master'
Emeraldnum and playcredits can only be set when initialising a new gamedata

See merge request KartKrew/Kart!2271
2024-04-14 07:42:15 +00:00
Sally Coolatta
fbc80984c6 Increase delay on prisons reset 2024-04-14 03:32:02 -04:00
James R
3eba2cf60d CMakeLists.txt: use libfmt from thirdparty/fmt
Now compiles on Ubuntu 22.04, which only has libfmt 8.
I don't know which exact version of libfmt we need but the
one in thirdparty works.

This version of libfmt is header-only.
2024-04-14 00:24:40 -07:00
Sal
077f12344e Merge branch 'reduce-vfx-vote-bg' into 'master'
Don't animate vote planet for reduce vfx

See merge request KartKrew/Kart!2279
2024-04-14 06:36:04 +00:00
Sal
171df9e2fa Merge branch 'allow-promoted-admin-gametypes' into 'master'
Allow promoted admins to trigger vote screen (gametype change)

See merge request KartKrew/Kart!2282
2024-04-14 06:34:27 +00:00
AJ Martinez
89953dfe42 Check vote setup command for admin rights 2024-04-13 23:32:56 -07:00
AJ Martinez
a7085d7494 Allow promoted admins to trigger vote screen (gametype change) 2024-04-13 23:29:12 -07:00
Sal
53ddbcd6bf Merge branch 'sneaker-panel-dontencoremap' into 'master'
Don't remap MT_SNEAKERPANEL in encore mode

Closes #1270

See merge request KartKrew/Kart!2277
2024-04-14 06:20:57 +00:00
Sally Coolatta
4de8c7a49f Fix Prisons reset behavior
The elimination behavior was completely preventing the prisons behavior from even being checked.
2024-04-13 17:28:45 -04:00
Sally Coolatta
51fd4ea562 Don't animate vote planet for reduce vfx
... instead of the temporary black BG.
2024-04-13 16:55:54 -04:00
Lach
ddbb1709d0 Don't remap MT_SNEAKERPANEL in encore mode 2024-04-13 13:15:53 +10:00
toaster
915585697a Update asset hashes 2024-04-13 01:17:12 +01:00
toaster
f9c0c535a2 Final object/state missing flags
- Fullbright for Servant Hand
- Don't encore remap for wallspike base, Big Ring
2024-04-13 00:49:01 +01:00
toaster
39b811111f Merge branch 'oopsies-fixme-pt69' into 'master'
Prevent weird 1-frame whip trick that I don't understand

See merge request KartKrew/Kart!2276
2024-04-12 23:43:12 +00:00
AJ Martinez
a52da75df2 Prevent weird 1-frame whip trick that I don't understand 2024-04-12 15:27:57 -07:00
toaster
25e728fd33 Merge branch 'dedi-final' into 'master'
Final work for Dedicated Servers

See merge request KartKrew/Kart!2275
2024-04-12 21:25:55 +00:00
toaster
7246625aa2 Merge branch 'reasonable-drawdist' into 'master'
Better draw distance options

See merge request KartKrew/Kart!2274
2024-04-12 19:16:42 +00:00
toaster
12fe57a805 P_InitMapData: Don't print the base map names in the startup/dedicated log 2024-04-12 14:20:06 +01:00
toaster
2caa5ff018 Dedicated server -spoilers startup parameter
Servers should get enough free for a healthy launch ecosystem, but not everything.
We'll give the relevant password out after, like, the first week probably? Please be patient, commit-diver
2024-04-12 14:17:33 +01:00
toaster
54d6914b50 Add M_TryExactPassword
Single-use password technology that exists outside of the enumerated list
2024-04-12 14:05:15 +01:00
toaster
6c0118d491 Fix dedicated server Encore warp getting ahead of non-dedicated clients
There was new waiting time added to the non-dedicated behaviour that was not added for the other case
2024-04-12 14:01:24 +01:00
wolfs
e1998e731e Merge remote-tracking branch 'remotes/origin/master' into reasonable-drawdist 2024-04-12 00:42:54 -05:00
wolfs
d9c101a550 Better draw distance options
- Use human-readable names instead of numbers (numbers are still viewable from "help drawdist")
- Remove unplayably short draw distances and add more options between 8192 and Infinite
2024-04-12 00:17:13 -05:00
Oni
c9bd088c13 Merge branch 'make-way-bots' into 'master'
Kick CPU players to make room for human players that are waiting to play

See merge request KartKrew/Kart!2259
2024-04-12 03:41:38 +00:00
Oni
a7951fc41c Merge branch 'furybike' into 'master'
Fury Bike

See merge request KartKrew/Kart!2273
2024-04-12 03:41:24 +00:00
Oni
3154d8ccf9 Merge branch 'emerald-disambig' into 'master'
Make default Emerald pickup in extra Sealed Star a fake SA2 yellow-gold Chaos Emerald

See merge request KartKrew/Kart!2268
2024-04-12 03:40:49 +00:00
Oni
47b44086e9 Merge branch 'show-lap-time' into 'master'
Show last lap time on HUD

See merge request KartKrew/Kart!2267
2024-04-12 03:40:38 +00:00
Oni
81644692d0 Merge branch 'more-gameplay-option-restrictions' into 'master'
More gameplay option restrictions

See merge request KartKrew/Kart!2269
2024-04-12 03:40:29 +00:00
Oni
ee1fb29de8 Merge branch 'no-gp-thunderdome' into 'master'
No thunderdome in GP

Closes #1265

See merge request KartKrew/Kart!2266
2024-04-12 03:40:20 +00:00
Oni
283f2188db Merge branch 'clear-data-fixes' into 'master'
Erase Data screen now has responsibilities more properly divided

Closes #1204 and #1155

See merge request KartKrew/Kart!2263
2024-04-12 03:40:14 +00:00
AJ Martinez
cb7a579b16 Fury Bike 2024-04-11 17:43:59 -07:00
Sal
f7a7180a3c Merge branch 'tape-dewhelmer' into 'master'
Adjust Tape's feature

See merge request KartKrew/Kart!2272
2024-04-12 00:08:33 +00:00
AJ Martinez
da35e3b46f Adjust Tape's feature 2024-04-11 16:43:14 -07:00
Sal
7ea0d5e314 Merge branch 'profile-naming-improvement' into 'master'
Improve profile naming

See merge request KartKrew/Kart!2265
2024-04-11 21:57:23 +00:00
Sal
ff9d202de4 Merge branch 'gl-fade-placeholder' into 'master'
V_DrawCustomFadeScreen fallback behaviour for Legacy GL

See merge request KartKrew/Kart!2270
2024-04-11 21:56:10 +00:00
Sally Coolatta
1e40d08cec HandleConnect handles bots 2024-04-11 17:41:06 -04:00
toaster
17801d5275 Emeraldnum and playcredits can only be set when initialising a new gamedata 2024-04-11 22:41:04 +01:00
toaster
1765e270d1 V_DrawCustomFadeScreen fallback behaviour for Legacy GL 2024-04-11 22:12:21 +01:00
toaster
dd0e3ca5f1 Fix apostrophe and quotation mark locations for not-yet-completed time in Time Attack modes 2024-04-11 21:36:56 +01:00
toaster
c758ba3062 K_drawKartTimestamp: Fix time attack HUD flashing when lap animation is in play 2024-04-11 21:35:43 +01:00
toaster
07b945be29 Fix desynced popt_e order 2024-04-11 21:10:14 +01:00