Merge branch 'object_tweaks' into 'master' (4d022046) · 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

4d022046

Commit 4d022046 authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'object_tweaks' into 'master'

Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394

parents 1c1fefe2 f2596ab0

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 125 additions, 99 deletions

extras/conf/SRB2-22.cfg
src/d_player.h 2 additions, 0 deletions

src/d_player.h
src/dehacked.c 40 additions, 0 deletions

src/dehacked.c
src/hardware/hw_light.c 4 additions, 0 deletions

src/hardware/hw_light.c
src/info.c 201 additions, 2 deletions

src/info.c
src/info.h 43 additions, 0 deletions

src/info.h
src/p_enemy.c 2 additions, 1 deletion

src/p_enemy.c
src/p_inter.c 8 additions, 0 deletions

src/p_inter.c
src/p_map.c 55 additions, 7 deletions

src/p_map.c
src/p_mobj.c 83 additions, 0 deletions

src/p_mobj.c
src/p_user.c 23 additions, 6 deletions

src/p_user.c
src/sounds.c 1 addition, 1 deletion

src/sounds.c

with 587 additions and 116 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