Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle (923dc342) · 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

923dc342

Commit 923dc342 authored 5 years ago by Marco Z

Downloads
- Plain Diff

Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle

parents 9913cc39 6244489f

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 17 additions, 0 deletions

src/dehacked.c
src/p_enemy.c 2 additions, 6 deletions

src/p_enemy.c
src/p_inter.c 5 additions, 5 deletions

src/p_inter.c
src/p_local.h 41 additions, 0 deletions

src/p_local.h
src/p_tick.c 7 additions, 0 deletions

src/p_tick.c
src/p_user.c 183 additions, 37 deletions

src/p_user.c
src/s_sound.c 265 additions, 0 deletions

src/s_sound.c
src/s_sound.h 27 additions, 0 deletions

src/s_sound.h
src/sdl/i_video.c 2 additions, 3 deletions

src/sdl/i_video.c
src/sdl/mixer_sound.c 23 additions, 2 deletions

src/sdl/mixer_sound.c
src/win32/win_main.c 3 additions, 3 deletions

src/win32/win_main.c

with 575 additions and 56 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