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

c133e645

Commit c133e645 authored 5 years ago by fickleheart

Downloads
- Plain Diff

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

parents f8a3e3b8 fc1eff6e

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 22

Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 3 additions, 3 deletions

appveyor.yml
src/hardware/hw_bsp.c 5 additions, 1 deletion

src/hardware/hw_bsp.c
src/hardware/hw_main.c 7 additions, 4 deletions

src/hardware/hw_main.c
src/lua_hook.h 7 additions, 0 deletions

src/lua_hook.h
src/lua_hooklib.c 130 additions, 0 deletions

src/lua_hooklib.c
src/lua_maplib.c 1 addition, 6 deletions

src/lua_maplib.c
src/m_menu.c 65 additions, 2 deletions

src/m_menu.c
src/p_map.c 14 additions, 1 deletion

src/p_map.c
src/p_maputl.c 17 additions, 48 deletions

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

src/p_maputl.h
src/p_mobj.c 10 additions, 6 deletions

src/p_mobj.c
src/p_setup.c 42 additions, 43 deletions

src/p_setup.c
src/p_sight.c 3 additions, 0 deletions

src/p_sight.c
src/p_slopes.c 6 additions, 5 deletions

src/p_slopes.c
src/p_spec.c 20 additions, 25 deletions

src/p_spec.c
src/p_tick.c 15 additions, 0 deletions

src/p_tick.c
src/r_data.c 3 additions, 3 deletions

src/r_data.c
src/r_defs.h 1 addition, 1 deletion

src/r_defs.h
src/r_main.c 9 additions, 3 deletions

src/r_main.c
src/r_segs.c 0 additions, 3 deletions

src/r_segs.c

with 359 additions and 155 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