Merge branch 'public_todo_next' into next (83461f49) · Commits · STJr / SRB2 · GitLab

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

83461f49

Commit 83461f49 authored 10 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'public_todo_next' into next

All commits that was in private that are not SRB2 2.2 had moved to public's next

parents cf3bd83e 649dd7bd

No related branches found

No related tags found

No related merge requests found

Changes 37

Hide whitespace changes

Inline Side-by-side

Showing

SRB2.cbp 53 additions, 166 deletions

SRB2.cbp
cmake/Modules/FindSDL2.cmake 0 additions, 1 deletion

cmake/Modules/FindSDL2.cmake
src/d_main.c 3 additions, 3 deletions

src/d_main.c
src/d_netcmd.c 21 additions, 1 deletion

src/d_netcmd.c
src/dehacked.c 32 additions, 9 deletions

src/dehacked.c
src/doomdef.h 3 additions, 1 deletion

src/doomdef.h
src/g_game.c 5 additions, 16 deletions

src/g_game.c
src/hardware/hw_main.c 196 additions, 221 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 39 additions, 55 deletions

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 7 additions, 0 deletions

src/hardware/r_opengl/r_opengl.c
src/info.c 2 additions, 4 deletions

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

src/info.h
src/lua_hudlib.c 0 additions, 15 deletions

src/lua_hudlib.c
src/lua_maplib.c 0 additions, 10 deletions

src/lua_maplib.c
src/lua_mobjlib.c 1 addition, 1 deletion

src/lua_mobjlib.c
src/m_cheat.c 38 additions, 0 deletions

src/m_cheat.c
src/p_enemy.c 14 additions, 9 deletions

src/p_enemy.c
src/p_floor.c 43 additions, 23 deletions

src/p_floor.c
src/p_local.h 0 additions, 1 deletion

src/p_local.h
src/p_map.c 48 additions, 59 deletions

src/p_map.c

with 505 additions and 597 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