Merge branch 'master' into knuxstuff
Showing
- extras/conf/SRB2-22.cfg 6419 additions, 0 deletionsextras/conf/SRB2-22.cfg
- src/d_netcmd.c 5 additions, 5 deletionssrc/d_netcmd.c
- src/g_input.c 2 additions, 2 deletionssrc/g_input.c
- src/hardware/hw_md2.c 3 additions, 0 deletionssrc/hardware/hw_md2.c
- src/p_enemy.c 12 additions, 22 deletionssrc/p_enemy.c
- src/p_inter.c 1 addition, 1 deletionsrc/p_inter.c
- src/p_map.c 2 additions, 4 deletionssrc/p_map.c
- src/p_user.c 1 addition, 1 deletionsrc/p_user.c
- src/r_things.c 3 additions, 3 deletionssrc/r_things.c
- src/st_stuff.c 3 additions, 6 deletionssrc/st_stuff.c
Loading
Please register or sign in to comment