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

7676f111

Commit 7676f111 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents e63f77ea c46bfa2b

No related branches found

No related tags found

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!585Gametype ruleset changes

Changes 19

Expand all Show whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 6521 additions, 0 deletions

extras/conf/SRB2-22.cfg
src/dehacked.c 2 additions, 0 deletions

src/dehacked.c
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_game.c 5 additions, 8 deletions

src/g_game.c
src/hardware/hw_main.c 2 additions, 0 deletions

src/hardware/hw_main.c
src/lua_maplib.c 5 additions, 0 deletions

src/lua_maplib.c
src/m_cheat.c 8 additions, 14 deletions

src/m_cheat.c
src/m_misc.c 2 additions, 0 deletions

src/m_misc.c
src/p_enemy.c 1 addition, 1 deletion

src/p_enemy.c
src/p_map.c 2 additions, 2 deletions

src/p_map.c
src/p_mobj.c 13 additions, 83 deletions

src/p_mobj.c
src/p_polyobj.c 10 additions, 0 deletions

src/p_polyobj.c
src/p_setup.c 945 additions, 714 deletions

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

src/p_setup.h
src/p_slopes.c 3 additions, 4 deletions

src/p_slopes.c
src/p_spec.c 4 additions, 32 deletions

src/p_spec.c
src/r_bsp.c 3 additions, 1 deletion

src/r_bsp.c
src/r_defs.h 7 additions, 7 deletions

src/r_defs.h
src/r_segs.c 4 additions, 0 deletions

src/r_segs.c

with 7539 additions and 868 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