Monster Iestyn
|
268bde3fdf
|
Merge branch 'public_next'
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
|
2018-11-10 15:41:57 +00:00 |
|
Monster Iestyn
|
32077897b6
|
Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
|
2018-10-27 19:58:51 +01:00 |
|
Monster Iestyn
|
3e595b8f1b
|
Merge branch 'master' into ports-chopping-block
|
2017-10-14 20:47:04 +01:00 |
|
Alam Ed Arias
|
6fbdf37b18
|
Build: support building with clang 5.0
|
2017-09-30 08:54:17 -04:00 |
|
Monster Iestyn
|
5a16c39af0
|
XBOX was eXecuted
|
2017-09-29 19:27:17 +01:00 |
|
Alam Ed Arias
|
f03e591f64
|
change SDL into HAVE_SDL
|
2014-07-25 19:10:24 -04:00 |
|
Alam Ed Arias
|
b93cb1b65a
|
SRB2 2.1 release
|
2014-03-15 13:11:35 -04:00 |
|