Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into reduced_palette (ca7151f1) · 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

ca7151f1

Commit ca7151f1 authored 9 years ago by Yukita Mayako

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into reduced_palette

Conflicts:
	src/dehacked.c

parents 5409367a 79aaa00d

No related branches found

No related tags found

Loading

Changes 76

Hide whitespace changes

Inline Side-by-side

Showing

SRB2.cbp 53 additions, 166 deletions

SRB2.cbp
cmake/Modules/FindSDL2.cmake 0 additions, 1 deletion

cmake/Modules/FindSDL2.cmake
src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 0 deletions

src/Makefile
src/b_bot.c 2 additions, 2 deletions

src/b_bot.c
src/blua/luaconf.h 15 additions, 8 deletions

src/blua/luaconf.h
src/d_main.c 11 additions, 3 deletions

src/d_main.c
src/d_netcmd.c 23 additions, 3 deletions

src/d_netcmd.c
src/d_player.h 5 additions, 1 deletion

src/d_player.h
src/dehacked.c 133 additions, 85 deletions

src/dehacked.c
src/doomdef.h 12 additions, 7 deletions

src/doomdef.h
src/f_finale.c 1 addition, 0 deletions

src/f_finale.c
src/g_game.c 27 additions, 26 deletions

src/g_game.c
src/hardware/hw_main.c 197 additions, 222 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 41 additions, 57 deletions

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 7 additions, 0 deletions

src/hardware/r_opengl/r_opengl.c
src/info.c 106 additions, 69 deletions

src/info.c
src/info.h 97 additions, 56 deletions

src/info.h
src/lua_baselib.c 90 additions, 94 deletions

src/lua_baselib.c
src/lua_hook.h 5 additions, 4 deletions

src/lua_hook.h

with 828 additions and 804 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