Merge branch 'shield-button-touchups' into 'next' (89620dbd) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

89620dbd

Commit 89620dbd authored 1 year ago by Logan Aerl Arias

Downloads
- Plain Diff

Merge branch 'shield-button-touchups' into 'next'

Shield Button Touchups

See merge request STJr/SRB2!2257

parents 55a7afde ba35849b

No related branches found

No related tags found

1 merge request!2257Shield Button Touchups

Pipeline #2891 passed 1 year ago

Stage: build

Changes 13
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/deh_lua.c 12 additions, 3 deletions

src/deh_lua.c
src/deh_tables.c 1 addition, 0 deletions

src/deh_tables.c
src/g_demo.c 5 additions, 1 deletion

src/g_demo.c
src/g_game.c 33 additions, 24 deletions

src/g_game.c
src/g_game.h 3 additions, 2 deletions

src/g_game.h
src/g_input.c 0 additions, 1 deletion

src/g_input.c
src/lua_baselib.c 12 additions, 0 deletions

src/lua_baselib.c
src/m_menu.c 21 additions, 17 deletions

src/m_menu.c
src/netcode/d_netcmd.c 2 additions, 0 deletions

src/netcode/d_netcmd.c
src/p_local.h 1 addition, 0 deletions

src/p_local.h
src/p_user.c 72 additions, 62 deletions

src/p_user.c
src/st_stuff.c 4 additions, 2 deletions

src/st_stuff.c
src/y_inter.c 2 additions, 2 deletions

src/y_inter.c

with 168 additions and 114 deletions

Loading

Lactozilla @Lactozilla
mentioned in commit a6a57673
· 2 months ago

mentioned in commit a6a57673

mentioned in commit a6a5767335af87e0cabf968f8d73e3c87ebcf16d

Toggle commit list

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment