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

249d25a3

Commit 249d25a3 authored 9 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control

parents a749d79a 557a2372

No related branches found

No related tags found

No related merge requests found

Changes 42

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 13 additions, 1 deletion

.travis.yml
SRB2.cbp 0 additions, 17 deletions

SRB2.cbp
appveyor.yml 1 addition, 0 deletions

appveyor.yml
cmake/Modules/FindGME.cmake 4 additions, 4 deletions

cmake/Modules/FindGME.cmake
comptime.bat 9 additions, 9 deletions

comptime.bat
src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/Makefile 0 additions, 7 deletions

src/Makefile
src/am_map.c 0 additions, 33 deletions

src/am_map.c
src/b_bot.c 1 addition, 1 deletion

src/b_bot.c
src/config.h.in 8 additions, 0 deletions

src/config.h.in
src/d_main.c 12 additions, 6 deletions

src/d_main.c
src/d_main.h 0 additions, 1 deletion

src/d_main.h
src/dehacked.c 30 additions, 30 deletions

src/dehacked.c
src/doomdef.h 4 additions, 0 deletions

src/doomdef.h
src/doomtype.h 0 additions, 1 deletion

src/doomtype.h
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hardware/hw_main.c 0 additions, 6 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 0 additions, 185 deletions

src/hardware/hw_md2.c
src/lua_baselib.c 28 additions, 4 deletions

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

src/lua_hudlib.c

with 113 additions and 308 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