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

970a9d65

There was an error fetching the commit references. Please try again later.

Commit 970a9d65 authored 1 year ago by Lactozilla

💬

Downloads
- Plain Diff

Merge branch 'next' into more-sprite2

parents 0ffcf89c 35b6b215

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 13
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/hardware/hw_main.c 8 additions, 3 deletions

src/hardware/hw_main.c
src/lua_baselib.c 40 additions, 0 deletions

src/lua_baselib.c
src/lua_colorlib.c 329 additions, 15 deletions

src/lua_colorlib.c
src/lua_script.c 5 additions, 0 deletions

src/lua_script.c
src/lua_skinlib.c 6 additions, 1 deletion

src/lua_skinlib.c
src/m_cond.c 3 additions, 0 deletions

src/m_cond.c
src/m_menu.c 48 additions, 20 deletions

src/m_menu.c
src/netcode/d_netcmd.c 1 addition, 1 deletion

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

src/p_local.h
src/p_map.c 17 additions, 12 deletions

src/p_map.c
src/r_segs.c 23 additions, 8 deletions

src/r_segs.c
src/r_skins.c 5 additions, 1 deletion

src/r_skins.c
src/r_skins.h 1 addition, 0 deletions

src/r_skins.h

with 487 additions and 61 deletions

Loading

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