Merge branch 'netgame-gamedata' into 'next' (f7af77b9) · Commits · Mari0shi / 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
- Model experiments

Snippets Groups Projects

f7af77b9

Commit f7af77b9 authored 1 year ago by sphere

Downloads
- Plain Diff

Merge branch 'netgame-gamedata' into 'next'

[SUGOI] Multiplayer emblems

See merge request STJr/SRB2!1756

parents 363faed8 e06956a5

No related branches found

No related tags found

No related merge requests found

Changes 28

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 3 additions, 0 deletions

src/d_clisrv.c
src/d_main.c 7 additions, 2 deletions

src/d_main.c
src/d_netcmd.c 4 additions, 10 deletions

src/d_netcmd.c
src/deh_soc.c 5 additions, 1 deletion

src/deh_soc.c
src/dehacked.c 1 addition, 1 deletion

src/dehacked.c
src/doomstat.h 3 additions, 54 deletions

src/doomstat.h
src/f_finale.c 24 additions, 31 deletions

src/f_finale.c
src/g_game.c 133 additions, 129 deletions

src/g_game.c
src/g_game.h 13 additions, 12 deletions

src/g_game.h
src/hu_stuff.c 10 additions, 13 deletions

src/hu_stuff.c
src/lua_script.c 12 additions, 0 deletions

src/lua_script.c
src/m_cheat.c 5 additions, 5 deletions

src/m_cheat.c
src/m_cond.c 164 additions, 85 deletions

src/m_cond.c
src/m_cond.h 103 additions, 20 deletions

src/m_cond.h
src/m_menu.c 153 additions, 88 deletions

src/m_menu.c
src/m_random.c 2 additions, 3 deletions

src/m_random.c
src/p_inter.c 118 additions, 5 deletions

src/p_inter.c
src/p_local.h 2 additions, 0 deletions

src/p_local.h
src/p_mobj.c 14 additions, 33 deletions

src/p_mobj.c
src/p_saveg.c 225 additions, 0 deletions

src/p_saveg.c

with 1001 additions and 492 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