Alam Ed Arias
a29203acd8
Disable win_dbg
2017-12-26 20:24:08 -05:00
Alam Ed Arias
e2b604fdfd
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
TehRealSalt
c38423eeb0
Merge remote-tracking branch 'srb2public/next' into quads
...
Update
2017-12-22 20:55:59 -05:00
Alam Ed Arias
cf10b55be0
Win32: pragma hell
2017-10-28 18:39:42 -04:00
Alam Ed Arias
3ecc304332
Win32: just ignore format overflows
2017-10-28 18:33:47 -04:00
Alam Ed Arias
0250040a5b
Win32: all fails of DD and try more to stop format-overflow errors
2017-10-28 18:24:07 -04:00
Alam Ed Arias
a4072260db
Win32: try to fix up CD printf code
2017-10-28 18:13:59 -04: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
Alam Ed Arias
108b0c2732
Merge branch 'master' into disable_gettext
2017-03-29 16:56:44 -04:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
ZTsukei
559607dfe2
version num 1.0.04; Removed unneeded files from the md5 check
2017-02-17 19:39:10 -05: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
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05:00
Alam Ed Arias
628d1c4dab
DD: Mingw 3.4.5 build fix
2017-01-16 16:40:16 -05:00
Alam Ed Arias
55925cabe8
win32: fixup printf warnings
2017-01-08 14:06:30 -05:00
Alam Ed Arias
fca398ae4d
Win32 Debugger: no need for Win32 interface code for SDL
2016-12-22 19:40:02 -05:00
Monster Iestyn
d782638da8
Merge branch 'zlib_pkgconfig' into 'master'
...
Zlib pkgconfig
Linux build to include libgme by default
See merge request !116
2016-12-18 21:44:19 -05:00
Alam Ed Arias
93c9841360
move Windows zlib options out of PNG to ZLIB
2016-11-06 15:11:02 -05:00
Alam Ed Arias
1f6388a2e0
Fix up Win32 interface code misdeclaration of I_ClipboardPaste()
2016-11-03 14:35:32 -04:00
Inuyasha
bb20cfd6be
Clipboard copy/paste testing
...
(unfinished, but basics work)
2016-11-03 01:43:57 -07:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Monster Iestyn
69f556d40a
Split AA trees code from m_misc.c/.h into m_aatree.c/.h
...
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
2016-06-05 21:29:40 +01:00
Alam Ed Arias
f21c72b889
debug: always load exchndl.dll
2016-05-31 21:30:18 -04:00
Alam Ed Arias
b96b999c1e
MSVC: Move x86/x64 settings into commons props
2016-05-22 21:55:55 -04:00
Alam Ed Arias
79f3d6e072
MSVC: Tidy up project files by hand
2016-05-22 11:54:32 -04:00
Alam Ed Arias
57091261d9
MSVC: fixed up MSVC project
2016-05-21 23:53:04 -04:00
Alam Ed Arias
ff5587d1d5
Merge branch 'master' into next
2016-05-19 18:03:56 -04:00
Monster Iestyn
c846b0ab23
Aren't some of these things already added later in sdl/Makefiles.cfg?
...
* -lSDL2_mixer is already added to SDL_LDFLAGS by default, unless NOMIXER=1 is set
* -DSDLMAIN should also be added to OPTS by default for MINGW=1 builds, unless NOSDLMAIN=1 is set
2016-05-19 16:51:05 +01:00
Alam Ed Arias
e2a5783521
Merge branch 'master' into next
2016-05-19 01:39:45 -04:00
Alam Ed Arias
ab9f2ea831
MSVC: fixup Debug build linked
2016-05-18 21:11:30 -04:00
Alam Ed Arias
7058baed44
Merge branch 'master' into next
2016-05-18 20:07:27 -04:00
Alam Ed Arias
bbf9f5adc8
Makefile: use built-in SDL2 and SDL2_mixer for Mingw32 and Mingw64
2016-05-18 16:54:55 -04:00
Alam Ed Arias
5aa48cf7ca
fixed up old VS 2010 project to work with VS 2015, tested with FMOD/DirectX
2016-05-18 01:35:35 -04:00
Alam Ed Arias
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
Inuyasha
b258b9b503
remove cpuaffinity code from SDL
...
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
2016-02-22 23:08:34 -08:00
ZTsukei
69f9c10a99
16/02/15 Starting some setup
2016-02-15 11:08:54 -05:00
Alam Ed Arias
83461f49c5
Merge branch 'public_todo_next' into next
...
All commits that was in private that are not SRB2 2.2 had moved to public's next
2015-04-01 12:32:34 -04:00
Ronald Kinard
c43b41e183
Fix generation of SRB2DD target.
...
It still won't compile correctly. But this should avoid the error
messages related to it.
2015-03-08 04:30:07 -05:00
JTE
0dff0d84de
New HD SRB2 icon by VAdaPEga.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8994 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:07:56 -05:00
Ronald Kinard
53799eb390
cmake: Add CPack Package Generation
...
Generates zips only at the moment
2015-01-28 16:42:05 -06:00
Ronald Kinard
05f5ec664a
Initial CMake support pass
...
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
Ronald Kinard
3eafca0dc1
Fix compile errors on win32, warnings elsewhere
2014-11-13 22:58:08 -06:00
Ronald Kinard
be1565fce3
Add support for new HWR functions in win32 and sdl12
2014-11-13 22:34:09 -06:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Ronald Kinard
1bfea632c9
sdl2: windows exe rename srb2sdl2.exe
2014-07-25 23:08:37 -05:00
Alam Ed Arias
c59df51d19
Merge branch 'master' into sdl2
...
Conflicts:
comptime.sh
2014-04-09 14:54:06 -04:00
Alam Ed Arias
25448dec36
Compile Win32 EXE with -gdwarf-2
2014-04-07 10:03:14 -04:00
Alam Ed Arias
d040190a66
Merge branch 'master' of github.com:STJr/SRB2 into sdl2
2014-03-24 19:47:14 -04:00
Alam Ed Arias
a9c2395e8d
SDL interface no longer use FMOD.dll
2014-03-24 19:40:54 -04:00
Alam Ed Arias
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
