Merge branch 'next' into movement-refactor (ff379758) · 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

ff379758

Commit ff379758 authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into movement-refactor

# Conflicts:
#	src/p_map.c

parents d0d25025 6f854f2d

No related branches found

No related tags found

2 merge requests!985Shaders next merge,!912Clean up some movement code

Changes 65

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
extras/conf/SRB2-22.cfg 36 additions, 6 deletions

extras/conf/SRB2-22.cfg
src/am_map.c 2 additions, 5 deletions

src/am_map.c
src/b_bot.c 0 additions, 2 deletions

src/b_bot.c
src/config.h.in 4 additions, 2 deletions

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

src/d_clisrv.c
src/d_main.c 6 additions, 1 deletion

src/d_main.c
src/d_net.c 1 addition, 0 deletions

src/d_net.c
src/d_player.h 2 additions, 1 deletion

src/d_player.h
src/dehacked.c 23 additions, 2 deletions

src/dehacked.c
src/doomdef.h 5 additions, 9 deletions

src/doomdef.h
src/doomstat.h 17 additions, 1 deletion

src/doomstat.h
src/g_demo.c 93 additions, 89 deletions

src/g_demo.c
src/g_game.c 1 addition, 1 deletion

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

src/hardware/hw_light.c
src/hardware/hw_main.c 65 additions, 115 deletions

src/hardware/hw_main.c
src/hu_stuff.c 2 additions, 2 deletions

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

src/hu_stuff.h
src/info.c 20 additions, 10 deletions

src/info.c

with 284 additions and 251 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