Merge branch 'next' into 'next' (19bed32e) · 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

19bed32e

Commit 19bed32e authored 2 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'next' into 'next'

Merge master into next

See merge request !1861

parents 7f913b5a f5e1d972

No related branches found

No related tags found

1 merge request!1861Merge master into next

Changes 25

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 21 additions, 9 deletions

.circleci/config.yml
.gitignore 1 addition, 0 deletions

.gitignore
src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/android/i_system.c 1 addition, 1 deletion

src/android/i_system.c
src/b_bot.c 5 additions, 5 deletions

src/b_bot.c
src/blua/liolib.c 0 additions, 1 deletion

src/blua/liolib.c
src/d_player.h 2 additions, 2 deletions

src/d_player.h
src/g_game.c 2 additions, 2 deletions

src/g_game.c
src/hardware/hw_main.c 1 addition, 1 deletion

src/hardware/hw_main.c
src/hu_stuff.c 3 additions, 1 deletion

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

src/lua_hudlib.c
src/lua_hudlib_drawlist.h 1 addition, 1 deletion

src/lua_hudlib_drawlist.h
src/p_enemy.c 1 addition, 1 deletion

src/p_enemy.c
src/p_polyobj.c 2 additions, 2 deletions

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

src/p_saveg.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/p_tick.c 1 addition, 1 deletion

src/p_tick.c
src/p_user.c 6 additions, 5 deletions

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

src/r_fps.c
src/r_skins.c 1 addition, 1 deletion

src/r_skins.c

with 57 additions and 42 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