Merge branch 'newegg' into 'master' (0ed58944) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

0ed58944

Commit 0ed58944 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'newegg' into 'master'

Newegg dot blag

See merge request STJr/SRB2Internal!305

parents c6af108d fe99c645

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 17 additions, 46 deletions

src/dehacked.c
src/hardware/hw_light.c 3 additions, 4 deletions

src/hardware/hw_light.c
src/info.c 113 additions, 220 deletions

src/info.c
src/info.h 22 additions, 51 deletions

src/info.h
src/p_enemy.c 171 additions, 63 deletions

src/p_enemy.c
src/p_inter.c 6 additions, 0 deletions

src/p_inter.c
src/p_mobj.c 88 additions, 63 deletions

src/p_mobj.c
src/r_draw.c 9 additions, 2 deletions

src/r_draw.c

with 429 additions and 449 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