Merge remote-tracking branch 'origin/master' into rotsprite_i (91a01be8) · 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

91a01be8

Commit 91a01be8 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into rotsprite_i

parents 5f4d6c45 3580977e

No related branches found

No related tags found

No related merge requests found

Changes 27

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 8 additions, 0 deletions

src/d_main.c
src/dehacked.c 129 additions, 55 deletions

src/dehacked.c
src/f_finale.c 1014 additions, 60 deletions

src/f_finale.c
src/f_finale.h 32 additions, 1 deletion

src/f_finale.h
src/g_game.c 6 additions, 1 deletion

src/g_game.c
src/hardware/hw_cache.c 30 additions, 26 deletions

src/hardware/hw_cache.c
src/hardware/hw_data.h 2 additions, 2 deletions

src/hardware/hw_data.h
src/hardware/hw_light.c 15 additions, 14 deletions

src/hardware/hw_light.c
src/hardware/hw_md2.c 47 additions, 41 deletions

src/hardware/hw_md2.c
src/info.c 27 additions, 68 deletions

src/info.c
src/info.h 14 additions, 54 deletions

src/info.h
src/m_menu.c 57 additions, 5 deletions

src/m_menu.c
src/m_menu.h 13 additions, 4 deletions

src/m_menu.h
src/p_enemy.c 181 additions, 34 deletions

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

src/p_floor.c
src/p_inter.c 3 additions, 1 deletion

src/p_inter.c
src/p_map.c 3 additions, 3 deletions

src/p_map.c
src/p_mobj.c 28 additions, 20 deletions

src/p_mobj.c
src/p_spec.c 11 additions, 3 deletions

src/p_spec.c
src/p_user.c 58 additions, 18 deletions

src/p_user.c

with 1679 additions and 411 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