Monster Iestyn
|
0a0336a674
|
Merge branch 'master' into fof-slope-skew-backport
# Conflicts:
# src/r_segs.c
|
2018-11-23 22:40:28 +00:00 |
|
Monster Iestyn
|
d228e35fcb
|
Merge branch 'responsefile-fix' into 'master'
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
|
2018-11-23 15:59:40 -05:00 |
|
Steel Titanium
|
97dd291f3f
|
Merge branch 'master' into responsefile-fix
|
2018-11-23 15:29:52 -05:00 |
|
Alam Arias
|
30b9cef043
|
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
Render the skies correctly on splitscreen in OpenGL mode
|
2018-11-23 14:48:05 -05:00 |
|
Alam Arias
|
b1587cb0a3
|
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
Render the startup screen on OpenGL mode
|
2018-11-23 14:47:56 -05:00 |
|
Alam Arias
|
3d0fd7ff2e
|
Merge pull request #258 from light2yellow/master
m_fixed: asm: cc is not a register
|
2018-11-23 14:47:36 -05:00 |
|
Monster Iestyn
|
08af33c51f
|
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
|
2018-11-23 19:12:48 +00:00 |
|
Digiku
|
9a3d2d0ee5
|
Merge branch '21-credits-update' into 'master'
2.1.21 credits update
See merge request STJr/SRB2!339
|
2018-11-23 07:38:28 -05:00 |
|
Digiku
|
9154ece829
|
Merge branch '21-readme' into 'master'
Add README and LICENSE for installs
See merge request STJr/SRB2!335
|
2018-11-23 07:36:12 -05:00 |
|
Digiku
|
3c95a63fc2
|
Merge branch 'public-darker-credits' into 'master'
Make the credits pics darker
See merge request STJr/SRB2!336
|
2018-11-23 07:35:44 -05:00 |
|
Digiku
|
9519534031
|
Merge branch 'less-confusing-errors' into 'master'
Make the error less confusing
See merge request STJr/SRB2!337
|
2018-11-23 07:35:26 -05:00 |
|
mazmazz
|
2f7f472ca2
|
Update credits for 2.1.21
|
2018-11-23 07:34:23 -05:00 |
|
mazmazz
|
19a8b7b2b1
|
Finish 3rd party library license file
|
2018-11-22 23:24:06 -05:00 |
|
Steel Titanium
|
fe43deacec
|
Merge branch 'master' into responsefile-fix
|
2018-11-22 23:02:20 -05:00 |
|
Steel Titanium
|
933c1311cd
|
Make the error less confusing
|
2018-11-22 22:59:46 -05:00 |
|
mazmazz
|
0d4cd35e13
|
Make the credits pics darker
|
2018-11-22 20:08:02 -05:00 |
|
Monster Iestyn
|
37c0e646e4
|
Merge branch 'ms-update-alert-fix' into 'master'
Master Server Update alert fix
See merge request STJr/SRB2!333
|
2018-11-22 13:34:43 -05:00 |
|
mazmazz
|
e75a9e2def
|
Add README and LICENSE for installs
|
2018-11-22 07:41:35 -05:00 |
|
Monster Iestyn
|
4a88ddf897
|
Merge branch 'disappearing-servers-fix' into 'master'
Disappearing servers fix
See merge request STJr/SRB2!334
|
2018-11-21 17:12:37 -05:00 |
|
Monster Iestyn
|
3acc312923
|
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
|
2018-11-21 20:45:03 +00:00 |
|
Monster Iestyn
|
948466658f
|
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
|
2018-11-20 08:54:09 -05:00 |
|
Monster Iestyn
|
2d1f927a17
|
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...that was a mouthful
|
2018-11-19 22:12:26 +00:00 |
|
Monster Iestyn
|
418943acdc
|
change return type of M_CheckMODVersion to boolean
|
2018-11-19 17:47:23 +00:00 |
|
Monster Iestyn
|
797f9d180e
|
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
|
2018-11-19 17:46:38 +00:00 |
|
Alam Ed Arias
|
f34e1edb4d
|
Travis-CI: allow GCC 8.x to fail
|
2018-11-18 21:25:33 -05:00 |
|
Alam Ed Arias
|
a290c4727b
|
Merge branch 'master' into Travis_CI-gcc8
|
2018-11-18 21:23:27 -05:00 |
|
Alam Ed Arias
|
0b5069f36c
|
We need to include the NUL char
|
2018-11-18 20:21:32 -05:00 |
|
Alam Ed Arias
|
5a09d44fd2
|
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
|
2018-11-18 19:59:21 -05:00 |
|
Monster Iestyn
|
ab39534ef6
|
Merge branch 'mingw-64bit' into 'master'
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
|
2018-11-18 19:49:18 -05:00 |
|
Steel Titanium
|
243f4eedd8
|
Statically link stdc++ and libgcc into libgme
Should fix libgme depending on two DLLs externally.
|
2018-11-18 18:09:34 -05:00 |
|
Monster Iestyn
|
a400bb9ef6
|
Merge branch 'camera-subsector-crash-fix' into 'master'
Camera subsector crash fix
See merge request STJr/SRB2!318
|
2018-11-18 08:28:38 -05:00 |
|
Steel Titanium
|
c26c850f5d
|
Add missing 64-bit libgme dll
|
2018-11-15 13:30:59 -05:00 |
|
Steel Titanium
|
02c08a3e10
|
Some small changes
|
2018-11-14 21:01:54 -05:00 |
|
Steel Titanium
|
f02105732e
|
Fix up compiling on DD version
|
2018-11-14 18:00:10 -05:00 |
|
Steel Titanium
|
c5a97dcfe6
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
|
2018-11-14 17:28:41 -05:00 |
|
Alam Ed Arias
|
4695841b8d
|
fix format-truncation: need bigger string buffers
|
2018-11-14 16:50:52 -05:00 |
|
Monster Iestyn
|
3e6fcf1b8b
|
Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
|
2018-11-14 16:48:13 -05:00 |
|
Alam Ed Arias
|
fb08950c19
|
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
|
2018-11-14 16:32:57 -05:00 |
|
Alam Ed Arias
|
4e9fc881a2
|
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
|
2018-11-14 16:26:46 -05:00 |
|
Alam Ed Arias
|
6fa063375d
|
TravisCI: test build on GCC 8.x
|
2018-11-14 15:56:46 -05:00 |
|
MonsterIestyn
|
a4f8411ae7
|
Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
|
2018-11-14 19:57:47 +00:00 |
|
MonsterIestyn
|
772c072064
|
Merge branch 'master' into analog-flipcam-synch-fix
|
2018-11-14 19:36:39 +00:00 |
|
Monster Iestyn
|
8c95ef8a1d
|
Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4
See merge request STJr/SRB2!322
|
2018-11-14 12:58:07 -05:00 |
|
Monster Iestyn
|
fc4bb83c3e
|
Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9
See merge request STJr/SRB2!321
|
2018-11-14 12:57:54 -05:00 |
|
Alam Ed Arias
|
f81d01edca
|
Merge branch 'vc-xpm-fix' into 'master'
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
|
2018-11-14 11:00:20 -05:00 |
|
Alam Ed Arias
|
f73ea4f984
|
Clean up warnings
|
2018-11-14 10:52:16 -05:00 |
|
Marco Z
|
8777d5c6c9
|
Comment context for declaration changes; remove extern terms
|
2018-11-14 08:15:38 -05:00 |
|
Marco Z
|
51768e7dd1
|
Remove unnecessary SDLCALL from xpm declarations
|
2018-11-14 08:06:07 -05:00 |
|
Monster Iestyn
|
f3b59c1731
|
Fix VC project files to include hw_clip.c/h
|
2018-11-14 12:11:57 +00:00 |
|
Monster Iestyn
|
0625ffcf8a
|
Merge branch 'public-winsnd-libgme-fix' into 'master'
Missed #ifdef HAVE_LIBGME in win_snd
See merge request STJr/SRB2!326
|
2018-11-14 06:40:07 -05:00 |
|