Commit graph

23577 commits

Author SHA1 Message Date
Oni
9b8306c91b Merge branch 'menu-pokes' into 'master'
Menu Pokes

See merge request KartKrew/Kart!1248
2023-05-26 05:53:16 +00:00
AJ Martinez
691311ab14 Merge branch 'instashield' of git.do.srb2.org:KartKrew/Kart into instashield 2023-05-25 22:49:23 -07:00
AJ Martinez
20f57d7efa Don't drop emeralds unless it's a new hit 2023-05-25 22:49:14 -07:00
Sally Coolatta
ce7e083e13 Bots: Add instashield behaviors
Also tidied up some of the ring usage code.
2023-05-25 15:31:33 -04:00
Sally Coolatta
9d80323a3a Read-only mapthing_t
Map things are writeable in Lua, which I am pretty certain is a mistake because mapthings are not sent over the network at all. I considered making them net-synced (it would be relatively easy), but it also aligns with another, more "philosophical" issue: Doom generally copies over properties from mapthing_t into mobj_t, and then only refers to it again when needing to respawn an object -- mapthing_t is not really intended to be referred to very often at runtime. At best it's slightly annoying since some objects rely on a spawnpoint for behavior changes, at worst it may make ACS more confusing in the future since Thing and Mobj tags are mixed together or less useful since they wouldn't be able to modify behaviors of objects that are based on args.

So I decided to solve these two issues at the same time; just treat mapthing_t as something to copy values from, like OG Doom does it. This basically just means that special and args are also part of the mobj now instead of the mapthing, which should fill any desire to edit this stuff from Lua, and reduces the number of instances where objects need to check for their spawnpoint to function properly.
2023-05-25 14:40:55 -04:00
James R
3ad30c0c7a debugfile: replace mixed string/control character notation with hexdump
Example of old notation:

    [10]O[0,0]jartha[0,254,142,131]c[133]hL^{[170][[251,199]+E[181]U+t[247,183,129,165,152]#$[164,22,10,169]r[150,212,3,232,3,0,0,2,0,0,0,8,0]0[8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,9,2,0,0,1,0,217,161,192] D[0,0,0,0,0,0,0]

Example of new notation:

         0:  01 0e 6a 61  72 74 68 61  00 57 00 09  5a 00 42 00  ..jartha.W..Z.B.
        16:  02 01 00 b7  6a d4 20 6f  2b 45 b5                  ....j. o+E.
2023-05-24 18:33:22 -07:00
Eidolon
d2482287a9 Merge branch 'read-exact-span-vec' into 'master'
io: Specialize read_exact for Span/VecStream

See merge request KartKrew/Kart!1247
2023-05-24 22:35:16 +00:00
James R
f35de20c72 io: Fix name lookup for read_exact friend specializations 2023-05-23 23:05:44 -07:00
Eidolon
a2ea3bfd6c io: Specialize read_exact for Span/VecStream
These will always enter infinite loops in read_exact under correct use
when there is not enough data in them to read to the buffer, so we can
throw out early for EOF in those scenarios.
2023-05-23 23:04:34 -07:00
Eidolon
a8e122c36b Merge branch 'revert-palette-manager' into 'master'
Revert "hwr2: Track colormaps and lighttables tex globally"

See merge request KartKrew/Kart!1249
2023-05-23 14:46:36 +00:00
Eidolon
b8dabe82cf Revert "hwr2: Track colormaps and lighttables tex globally"
This reverts commit aa48237928.
2023-05-23 09:05:23 -05:00
toaster
8845f36a3d HU_DrawRankings: Adjust slightly
- Only show `Lap 0/Lap 1` if numlaps > 1, to match other circumstances where laps aren't real
- Only show player roundscore if gametype supports roundscore
- Otherwise accept a blank right side of the player bar in custom gametypes. (one day for Lua..?)
2023-05-22 15:32:07 +01:00
AJ Martinez
d9dda87586 Hide hitbox on nocollide whip 2023-05-20 16:30:35 -07:00
toaster
a0f0c83975 M_DrawMenuTyping: On Virtual Keyboard, highlight when system button presses occour
- A
- B/X
- C
- Start
2023-05-21 00:14:11 +01:00
toaster
04d87bfb6c M_MenuTypingInput: In Virtual Keyboard mode, assign some buttons as shortcuts
- Start: closes the menu
- B/X: backspace
- C: Toggle shift/caps lock
2023-05-21 00:04:45 +01:00
toaster
f24a640e04 Increase reliability of menuKey system
The intersection between processed buttons and raw keyboard data is a messy one and will probably never be perfect, but it is now consistent.
- Never overwrite a valid keyboard menuKey recieved this frame with a -1 if a different type of event is recieved as well.
- Store previous state of dpad_lr and dpad_ud on menucmd struct.
    - Previously, if `a` was bound to Turn Left, it could produce a valid menuKey for one frame, then be considered a leftward input - switching from manual keyboard to Virtual Keyboard.
    - It still only produces a valid menuKey for one frame... but we simply filter out leftward inputs that are older than this frame to keep things (relatively) clean.
2023-05-20 22:37:31 +01:00
AJ Martinez
18d84c6c2c Fix instawhip follow hitlag 2023-05-20 14:35:48 -07:00
toaster
df31f7cf3a M_HandleMenuInput: Fix incorrect menuKey comparison that was preventing the Virtual Keyboard from ever being activated on first opening 2023-05-20 21:03:23 +01:00
toaster
fb578d7da2 Add-ons menu: Add name and tooltip for Search/filter field
Now visible via Virtual Keyboard.
2023-05-20 20:43:41 +01:00
toaster
38ddfeeef8 Make virtual keyboard even stronger
- Show a textbox (with highlighted border) so the console font is more likely to be legible.
    - Increases the width of the virtual keys to match this.
- Show menu entry name and tooltip on faded view (if they exist), for additional context for what you're writing
- Make the text entry and the virtual keys slide seperately
2023-05-20 20:43:00 +01:00
Eidolon
2918f9b61c Merge branch 'more-rhi-stuff' into 'master'
More RHI improvements for HWR2

See merge request KartKrew/Kart!1246
2023-05-20 15:45:34 +00:00
AJ Martinez
85bfd5be12 Really, really drop emeralds from monitors dead center on the ground 2023-05-20 02:53:13 -07:00
AJ Martinez
3b947ebf85 Instawhip: On mutual contact, clash! 2023-05-20 02:39:05 -07:00
AJ Martinez
211e28611b Instawhip: No mercy 2023-05-20 00:15:05 -07:00
AJ Martinez
53a2a999d2 Whoops, that's a testing condition 2023-05-19 23:45:52 -07:00
AJ Martinez
2c44bafe74 Misc fixup 2023-05-19 23:43:53 -07:00
AJ Martinez
de8f4812cf Split instashield and guard cooldown 2023-05-19 23:30:20 -07:00
AJ Martinez
cac02bb01a Emerald fixups 2023-05-19 22:51:06 -07:00
AJ Martinez
bfcc453d56 Guard Break FX 2023-05-19 21:14:47 -07:00
Sal
15dce65efb Merge branch 'bot-game-speed' into 'master'
Bots: Rebalance rubberband speeds

See merge request KartKrew/Kart!1244
2023-05-20 03:59:03 +00:00
Sal
9bb474378e Merge branch 'rings-from-below' into 'master'
Add MF_PICKUPFROMBELOW to rings

Closes #446

See merge request KartKrew/Kart!1245
2023-05-20 03:58:25 +00:00
AJ Martinez
f6407d03d0 More guard sfx 2023-05-19 19:45:20 -07:00
AJ Martinez
d725963f42 Don't drain spheres while ebraking in guardbreak 2023-05-19 18:56:14 -07:00
AJ Martinez
9aa4a459ce Guard break, UFO instawhip 2023-05-19 18:45:27 -07:00
AJ Martinez
6f02923d89 Shield VFX 2023-05-19 17:59:47 -07:00
Eidolon
be869aefc6 rhi gl: Allow create_pipeline in gfx ctx
This function impl does not change any GL drawing state, and neither
should Vulkan, so the constraint that this function not be called while
a graphics context is active is not necessary.
2023-05-19 18:54:19 -05:00
Eidolon
aa48237928 hwr2: Track colormaps and lighttables tex globally
This will allow hardware to reuse the same colormap textures objects as
twodee.
2023-05-19 18:54:19 -05:00
Eidolon
7e4d61730e rhi: Fix handle std::hash specialization
This prevented hashing of non-const qualified types. The contract for
std::hash already implies that it is a callable for an lvalue reference
of the template type.
2023-05-19 18:54:19 -05:00
Eidolon
8d390c58d4 hwr2: Extract BlendMode enum from twodee
This enum is usable across multiple parts of hwr2 so it would be easier
to just keep it separate.
2023-05-19 18:54:19 -05:00
Eidolon
20002f83c4 rhi: Make some stencil state dynamic
The reference, compare mask and write mask for each face direction in
the stencil test is now dynamic pipeline state and are implicitly set to
default values when a pipeline is bound. This is implementable using
Vulkan dynamic pipeline state bits and so there is no reason not to
provide it.

In the OpenGL implementation of RHI, this requires tracking some stencil
state internally in the graphics context because the stencil state
functions require multiple inputs that do not cleanly map to the Vulkan
equivalents.
2023-05-19 18:54:19 -05:00
AJ Martinez
a3d954e4ef Guard: Scale graphic to player spheres 2023-05-19 15:35:31 -07:00
AJ Martinez
df6c9cee73 Instashield: actually do height checks 2023-05-19 15:34:54 -07:00
toaster
d86743f0ba Profile selection music
- `_OCEAN` on first launch without profile set, to avoid skipping between three different tracks in quick succession
- 'FILE' if you create a new profile on first launch OR if you go into Options->Profiles
2023-05-19 23:10:13 +01:00
toaster
ca68fe630b Show PAUSED image when the game is stopped by the pause command
In addition, don't show the pause menu PAUSED in modeattacking/netgames
This text is now snapto-affected, since we can't (or at least shouldn't) summon the widescreen border in regular pause instances.
2023-05-19 22:16:07 +01:00
toaster
f7107e2f66 Rearranged again
All that effort and I didn't notice there was two i's 🥹
2023-05-19 21:42:48 +01:00
toaster
af334f927f Cleanup of the Virtual Keyboard
- Variable width key support
    - Rearrangement of keys to take advantage of this
- Uses thin strings
    - Or arrow sigils for backspace/shift
- Shift and caps lock have been visually combined to match other virtual keyboards
    - Press shift once to enable shift, press again to disable shift and enable caps lock
    - Indicator light on shift to show capslock state
2023-05-19 21:21:48 +01:00
toaster
c8f350aa70 CON_ShiftChar: Integrate numpad translation from CON_Responder, so both chat and menu input can take advantage
The original written comment by Callum remarks that it was good for writing IP addresses, and this makes it apply to the IP address Online Menu field...
Also adds better comments.
2023-05-19 17:56:28 +01:00
toaster
8e4e2eb0a9 CON_Responder: *also* use CON_ShiftChar directly rather than have two different implementations that could desync 2023-05-19 17:42:16 +01:00
toaster
0845cf0775 M_ChangeStringVar: Fix Caps Lock by using CON_ShiftChar directly 2023-05-19 17:40:22 +01:00
toaster
276bbebc6f Use 6widthspace for Virtual Keyboard bottom-of-screen message 2023-05-19 17:33:08 +01:00