Merge branch 'superbutton' into 'next' (4706e80d) · 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

4706e80d

Commit 4706e80d authored 1 year ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'superbutton' into 'next'

Dedicated Shield / Super Transformation Button

See merge request !2096

parents 5f98f769 e5099386

No related branches found

No related tags found

2 merge requests!2355fix newer versions of mixerx,!2096Dedicated Shield / Super Transformation Button

Pipeline #1456 passed 1 year ago

Stage: build

Changes 12
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 4 additions, 0 deletions

src/d_player.h
src/d_ticcmd.h 15 additions, 12 deletions

src/d_ticcmd.h
src/deh_lua.c 1 addition, 1 deletion

src/deh_lua.c
src/deh_tables.c 3 additions, 4 deletions

src/deh_tables.c
src/g_game.c 8 additions, 2 deletions

src/g_game.c
src/g_input.c 10 additions, 12 deletions

src/g_input.c
src/g_input.h 1 addition, 3 deletions

src/g_input.h
src/lua_baselib.c 2 additions, 1 deletion

src/lua_baselib.c
src/m_menu.c 29 additions, 28 deletions

src/m_menu.c
src/p_local.h 1 addition, 1 deletion

src/p_local.h
src/p_user.c 150 additions, 146 deletions

src/p_user.c
src/y_inter.c 3 additions, 3 deletions

src/y_inter.c

with 227 additions and 213 deletions

Loading

Lactozilla @Lactozilla
mentioned in commit ee6ce2a1
· 3 months ago

mentioned in commit ee6ce2a1

mentioned in commit ee6ce2a1fb98f6ca008ae359b0386c929643f5f1

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