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

0aba0aa4

Commit 0aba0aa4 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 5f6c702e ff8c4366

No related branches found

No related tags found

Loading

Changes 39

Hide whitespace changes

Inline Side-by-side

Showing

.gitattributes 9 additions, 0 deletions

.gitattributes
src/am_map.c 36 additions, 25 deletions

src/am_map.c
src/am_map.h 0 additions, 5 deletions

src/am_map.h
src/d_main.c 5 additions, 1 deletion

src/d_main.c
src/d_netcmd.c 10 additions, 8 deletions

src/d_netcmd.c
src/dehacked.c 70 additions, 9 deletions

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

src/doomdef.h
src/filesrch.c 1 addition, 1 deletion

src/filesrch.c
src/g_game.c 46 additions, 34 deletions

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

src/g_game.h
src/hardware/hw_cache.c 4 additions, 4 deletions

src/hardware/hw_cache.c
src/hardware/hw_light.c 10 additions, 5 deletions

src/hardware/hw_light.c
src/hardware/hw_md2.c 19 additions, 8 deletions

src/hardware/hw_md2.c
src/info.c 481 additions, 154 deletions

src/info.c
src/info.h 91 additions, 26 deletions

src/info.h
src/m_menu.c 278 additions, 90 deletions

src/m_menu.c
src/m_menu.h 11 additions, 1 deletion

src/m_menu.h
src/m_misc.c 30 additions, 14 deletions

src/m_misc.c
src/m_misc.h 1 addition, 1 deletion

src/m_misc.h
src/p_enemy.c 171 additions, 20 deletions

src/p_enemy.c

with 1277 additions and 407 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