Merge branch 'emblem_hardcoding' into 'master' (8cbac266) · 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

8cbac266

Commit 8cbac266 authored 6 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'emblem_hardcoding' into 'master'

Emblem and unlockable softcoding

See merge request STJr/SRB2Internal!210

parents 2e066876 5eb089cc

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/config.h.in 0 additions, 2 deletions

src/config.h.in
src/d_main.c 13 additions, 18 deletions

src/d_main.c
src/dehacked.c 69 additions, 63 deletions

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

src/dehacked.h
src/info.c 2 additions, 2 deletions

src/info.c
src/m_cond.c 9 additions, 640 deletions

src/m_cond.c
src/m_cond.h 2 additions, 5 deletions

src/m_cond.h
src/p_mobj.c 59 additions, 1 deletion

src/p_mobj.c
src/p_setup.c 7 additions, 71 deletions

src/p_setup.c
src/w_wad.c 12 additions, 12 deletions

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

src/w_wad.h

with 176 additions and 817 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