Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

59b2205b

Verified Commit 59b2205b authored 2 years ago by X.organic

Downloads
- Plain Diff

Merge branch 'futurepk3' into moe-futurepk3

Yes, the sole purpose of this branch is to have Moe Mansion with
futurepk3 added, because both mess with w_wad.c.

parents 4849fb5c b3dd9797

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/byteptr.h 75 additions, 23 deletions

src/byteptr.h
src/d_main.c 23 additions, 0 deletions

src/d_main.c
src/d_netcmd.c 2 additions, 2 deletions

src/d_netcmd.c
src/hu_stuff.c 6 additions, 6 deletions

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

src/hu_stuff.h
src/lua_script.c 2 additions, 2 deletions

src/lua_script.c
src/m_menu.c 92 additions, 2 deletions

src/m_menu.c
src/mserv.c 3 additions, 0 deletions

src/mserv.c
src/mserv.h 2 additions, 0 deletions

src/mserv.h
src/r_data.c 24 additions, 8 deletions

src/r_data.c
src/w_wad.c 457 additions, 113 deletions

src/w_wad.c
src/w_wad.h 13 additions, 2 deletions

src/w_wad.h

with 700 additions and 159 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