Merge branch 'public_next' (291ebf30) · 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

291ebf30

Commit 291ebf30 authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/Makefile
#	src/lua_script.c
#	src/p_user.c
#	src/sdl/i_system.c
#	src/v_video.c
#	src/w_wad.c

parents b75f54ea 8196c595

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 14 additions, 7 deletions

src/Makefile
src/hardware/hw_main.c 18 additions, 4 deletions

src/hardware/hw_main.c
src/lua_script.c 7 additions, 5 deletions

src/lua_script.c
src/p_mobj.c 20 additions, 17 deletions

src/p_mobj.c
src/p_mobj.h 4 additions, 0 deletions

src/p_mobj.h
src/p_saveg.c 2 additions, 4 deletions

src/p_saveg.c
src/p_spec.c 10 additions, 24 deletions

src/p_spec.c
src/p_tick.c 12 additions, 12 deletions

src/p_tick.c
src/p_user.c 19 additions, 21 deletions

src/p_user.c
src/r_things.c 19 additions, 4 deletions

src/r_things.c
src/sdl/i_system.c 74 additions, 30 deletions

src/sdl/i_system.c
src/sdl/mixer_sound.c 43 additions, 12 deletions

src/sdl/mixer_sound.c
src/v_video.c 1 addition, 1 deletion

src/v_video.c
src/w_wad.c 3 additions, 3 deletions

src/w_wad.c
src/win32/win_snd.c 3 additions, 5 deletions

src/win32/win_snd.c

with 249 additions and 149 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