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

1a209146

Commit 1a209146 authored 1 year ago by Sal

Downloads
- Plain Diff

Merge branch 'spemblems' into 'next'

Allow obtaining ring, time & grade emblems in regular gameplay

See merge request STJr/SRB2!1752

parents ee670705 86b4f936

No related branches found

No related tags found

1 merge request!1752Allow obtaining ring, time & grade emblems in regular gameplay

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/d_player.h 2 additions, 1 deletion

src/d_player.h
src/g_game.c 194 additions, 136 deletions

src/g_game.c
src/g_game.h 1 addition, 2 deletions

src/g_game.h
src/lua_playerlib.c 8 additions, 0 deletions

src/lua_playerlib.c
src/m_cond.c 1 addition, 1 deletion

src/m_cond.c
src/m_cond.h 1 addition, 1 deletion

src/m_cond.h
src/p_saveg.c 51 additions, 10 deletions

src/p_saveg.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/p_user.c 7 additions, 5 deletions

src/p_user.c

with 267 additions and 158 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