Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

RingRacers
- Activity
- Members
- Labels
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

fe6bfd1f

Commit fe6bfd1f authored 2 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into wall-transfer-everything

parents 79f44540 dbef7fb4

Branches

Tags

No related merge requests found

Changes 28

Expand all Show whitespace changes

Inline Side-by-side

Showing

src/d_player.h 3 additions, 0 deletions

src/d_player.h
src/deh_tables.c 5 additions, 1 deletion

src/deh_tables.c
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/info.c 55 additions, 23 deletions

src/info.c
src/info.h 7 additions, 2 deletions

src/info.h
src/k_hud.c 18 additions, 36 deletions

src/k_hud.c
src/k_kart.c 384 additions, 243 deletions

src/k_kart.c
src/k_kart.h 11 additions, 5 deletions

src/k_kart.h
src/k_menudraw.c 4 additions, 40 deletions

src/k_menudraw.c
src/k_objects.h 9 additions, 0 deletions

src/k_objects.h
src/k_respawn.c 1 addition, 0 deletions

src/k_respawn.c
src/lua_playerlib.c 10 additions, 0 deletions

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

src/lua_script.c
src/objects/Sourcefile 2 additions, 0 deletions

src/objects/Sourcefile
src/objects/manta-ring.c 307 additions, 0 deletions

src/objects/manta-ring.c
src/objects/shrink.c 8 additions, 0 deletions

src/objects/shrink.c
src/objects/spb.c 1024 additions, 0 deletions

src/objects/spb.c
src/p_enemy.c 0 additions, 511 deletions

src/p_enemy.c
src/p_inter.c 3 additions, 33 deletions

src/p_inter.c

with 1853 additions and 901 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