TehRealSalt
|
1b4f893385
|
Merge remote-tracking branch 'refs/remotes/srb2public/fof-slope-skew-backport'
|
2018-03-11 12:47:44 -04:00 |
|
Alam Ed Arias
|
82f2f2f2f9
|
SDL: disable check for noreturn
|
2018-01-04 14:29:29 -05:00 |
|
TehRealSalt
|
42ddd32406
|
Merge remote-tracking branch 'refs/remotes/srb2public/master'
|
2018-01-02 22:59:43 -05:00 |
|
Alam Ed Arias
|
a29203acd8
|
Disable win_dbg
|
2017-12-26 20:24:08 -05:00 |
|
TehRealSalt
|
5fe2f4928f
|
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
|
2017-10-17 15:53:34 -04:00 |
|
Monster Iestyn
|
b040113246
|
Removed the wrong endif by mistake
|
2017-09-16 20:59:35 +01:00 |
|
Monster Iestyn
|
a33bb70a0c
|
Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
|
2017-09-16 20:26:04 +01:00 |
|
Sryder
|
68d439a783
|
Merge branch 'upstream/next' into zarrotsu_vanillamerge
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
|
2017-02-17 20:14:55 +00:00 |
|
Sryder
|
2d6c7959ed
|
Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
# Conflicts:
# .gitignore
# libs/zlib/projects/visualc10/zlib.vcxproj
# src/Makefile
# src/am_map.c
# src/d_main.c
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hardware/hw_main.c
# src/hardware/hw_md2.c
# src/info.c
# src/p_inter.c
# src/p_map.c
# src/p_mobj.c
# src/p_spec.c
# src/p_user.c
# src/r_bsp.c
# src/r_plane.c
# src/r_segs.c
# src/r_things.c
# src/s_sound.c
# src/s_sound.h
# src/sdl/Srb2SDL-vc10.vcxproj
# src/win32/Srb2win-vc10.vcxproj
# src/win32/Srb2win.ico
# src/y_inter.c
|
2017-02-17 20:03:10 +00:00 |
|
ZTsukei
|
b0b51f9a61
|
Some position code
|
2017-02-12 23:25:06 -05:00 |
|
ZTsukei
|
e4a970f894
|
Starting from scratch. SRB2 v2.1.15
|
2016-07-06 00:10:19 -04:00 |
|
Alam Ed Arias
|
f21c72b889
|
debug: always load exchndl.dll
|
2016-05-31 21:30:18 -04:00 |
|
Alam Ed Arias
|
d9aa430817
|
use memmove in D_MD5PasswordPass() and drop noreturn
|
2016-05-28 19:42:38 -04:00 |
|
Alam Ed Arias
|
35f36e1bba
|
travis-ci: set v of nulK to 0
|
2016-05-28 19:28:37 -04:00 |
|
Alam Ed Arias
|
02e67a4a95
|
travis: add gcc 4.4, 4.6 and 4.7
|
2016-05-28 19:15:37 -04:00 |
|
Alam Ed Arias
|
ad6c2e634f
|
travis: disable xcode6.3
|
2016-05-28 19:08:50 -04:00 |
|
Alam Ed Arias
|
f4a84c916e
|
travis: Fixedup gcc 5 error and allow gcc 6 to fail
|
2016-05-28 18:41:08 -04:00 |
|
Alam Ed Arias
|
6b626f1b27
|
build: cmake is messly
|
2016-02-07 20:53:27 -05:00 |
|
Alam Ed Arias
|
e8cf4cdaac
|
SDL2: compile SDL with SDL_main for Win32
|
2016-01-29 00:33:11 -05:00 |
|
Alam Ed Arias
|
c47ff7b3c6
|
let make the main() entry point noreturns
|
2016-01-28 21:37:41 -05:00 |
|
Alam Ed Arias
|
050ce857c4
|
let not care for main() being noreturn
|
2016-01-28 21:31:18 -05:00 |
|
Alam Ed Arias
|
73b3287b19
|
SRB2 2.1.14 release
|
2015-01-01 14:50:31 -05: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 |