Merge branch 'hardcoding-time-again' into 'master' (04063ba3) · 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

04063ba3

Commit 04063ba3 authored 6 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'hardcoding-time-again' into 'master'

Hardcoding time again

See merge request STJr/SRB2Internal!130

parents d1b45c72 21cb0cab

No related branches found

No related tags found

No related merge requests found

Changes 47

Expand all Hide whitespace changes

Inline Side-by-side

Showing

bin/Mingw/Release/.gitignore 1 addition, 0 deletions

bin/Mingw/Release/.gitignore
src/b_bot.c 1 addition, 2 deletions

src/b_bot.c
src/config.h.in 2 additions, 2 deletions

src/config.h.in
src/console.c 1 addition, 1 deletion

src/console.c
src/d_clisrv.c 12 additions, 10 deletions

src/d_clisrv.c
src/d_clisrv.h 2 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 3 additions, 3 deletions

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

src/d_netcmd.c
src/d_player.h 3 additions, 2 deletions

src/d_player.h
src/dehacked.c 754 additions, 333 deletions

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

src/doomdata.h
src/doomdef.h 1 addition, 1 deletion

src/doomdef.h
src/doomstat.h 2 additions, 4 deletions

src/doomstat.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_game.c 19 additions, 24 deletions

src/g_game.c
src/hardware/hw_light.c 71 additions, 24 deletions

src/hardware/hw_light.c
src/hu_stuff.c 4 additions, 1 deletion

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

src/hu_stuff.h
src/info.c 4394 additions, 2247 deletions

src/info.c
src/info.h 599 additions, 141 deletions

src/info.h

with 5877 additions and 2823 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