Merge branch 'more-sprite2' into 'next' (ee96ed12) · 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

ee96ed12

Commit ee96ed12 authored 1 year ago by sphere

Downloads
- Plain Diff

Merge branch 'more-sprite2' into 'next'

Add 'sprite2' field to states

See merge request !2211

parents cf7adfc8 5dd82cb7

No related branches found

No related tags found

1 merge request!2211Add 'sprite2' field to states

Pipeline #2922 passed 1 year ago

Stage: build

Changes 24
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/deh_tables.c 4 additions, 0 deletions

src/deh_tables.c
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_demo.c 14 additions, 14 deletions

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

src/hardware/hw_main.c
src/hardware/hw_md2.c 58 additions, 35 deletions

src/hardware/hw_md2.c
src/hardware/hw_model.c 20 additions, 8 deletions

src/hardware/hw_model.c
src/hardware/hw_model.h 1 addition, 0 deletions

src/hardware/hw_model.h
src/info.c 2760 additions, 2760 deletions

src/info.c
src/info.h 9 additions, 9 deletions

src/info.h
src/lua_baselib.c 52 additions, 4 deletions

src/lua_baselib.c
src/lua_hudlib.c 8 additions, 9 deletions

src/lua_hudlib.c
src/lua_infolib.c 1 addition, 1 deletion

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

src/lua_mobjlib.c
src/lua_skinlib.c 9 additions, 4 deletions

src/lua_skinlib.c
src/m_menu.c 1 addition, 1 deletion

src/m_menu.c
src/p_mobj.c 60 additions, 44 deletions

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

src/p_mobj.h
src/p_pspr.h 5 additions, 0 deletions

src/p_pspr.h
src/p_saveg.c 4 additions, 4 deletions

src/p_saveg.c
src/p_user.c 3 additions, 3 deletions

src/p_user.c

with 3015 additions and 2902 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