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

f8a3e3b8

Commit f8a3e3b8 authored 5 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into next-newcontrols

parents f0e6a56b a6926e33

No related branches found

No related tags found

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!647fcam simple controls but slightly less hacky

Changes 32

Hide whitespace changes

Inline Side-by-side

Showing

src/b_bot.c 27 additions, 21 deletions

src/b_bot.c
src/b_bot.h 1 addition, 0 deletions

src/b_bot.h
src/command.c 2 additions, 2 deletions

src/command.c
src/command.h 3 additions, 0 deletions

src/command.h
src/d_clisrv.c 7 additions, 7 deletions

src/d_clisrv.c
src/d_clisrv.h 2 additions, 2 deletions

src/d_clisrv.h
src/d_main.c 1 addition, 1 deletion

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

src/d_netcmd.c
src/dehacked.c 14 additions, 11 deletions

src/dehacked.c
src/doomdef.h 2 additions, 0 deletions

src/doomdef.h
src/doomstat.h 29 additions, 26 deletions

src/doomstat.h
src/g_game.c 109 additions, 59 deletions

src/g_game.c
src/g_game.h 3 additions, 0 deletions

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

src/hu_stuff.c
src/lua_baselib.c 27 additions, 0 deletions

src/lua_baselib.c
src/lua_consolelib.c 21 additions, 0 deletions

src/lua_consolelib.c
src/lua_hook.h 4 additions, 0 deletions

src/lua_hook.h
src/lua_hooklib.c 48 additions, 1 deletion

src/lua_hooklib.c
src/lua_script.c 1 addition, 3 deletions

src/lua_script.c
src/m_menu.c 19 additions, 8 deletions

src/m_menu.c

with 324 additions and 145 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