wolfy852
|
d294be2054
|
Fix a quick merge mistake.
|
2018-11-29 07:15:54 -06:00 |
|
TehRealSalt
|
c70cf5908d
|
IsPlayerAdmin support, since admin was removed
# Conflicts:
# src/lua_baselib.c
|
2018-11-29 07:12:15 -06:00 |
|
Wolfy
|
b59718d3ad
|
Remove hardcoded limit on admins
# Conflicts:
# src/d_netcmd.c
|
2018-11-29 07:05:49 -06:00 |
|
Wolfy
|
b8ce51bff2
|
Multiple admins
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
|
2018-11-29 06:46:59 -06:00 |
|
mazmazz
|
36e020c366
|
Update version to 2.1.21
|
2018-11-23 06:58:45 -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 |
|
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 |
|
Marco Z
|
0b97b2a76c
|
Missed #ifdef HAVE_LIBGME in win_snd
|
2018-11-13 22:50:08 -05:00 |
|
mazmazz
|
b4c87d585e
|
Add SDL Mixer 2.0.4 VC package
|
2018-11-13 22:05:05 -05:00 |
|
mazmazz
|
85fc8a1d47
|
Add SDL 2.0.9 VC package
|
2018-11-13 22:02:18 -05:00 |
|
Steel Titanium
|
4836e711d3
|
Fix up 64-bit MINGW
|
2018-11-13 20:32:18 -05:00 |
|
Monster Iestyn
|
302358c403
|
Merge branch 'mixer-sound-x64-fix' into 'master'
mixer_sound fix x64 build issue
See merge request STJr/SRB2!323
|
2018-11-13 17:42:23 -05:00 |
|
Monster Iestyn
|
41b4ffd458
|
Merge branch 'extend-png-metadata' into 'master'
Save the current renderer to screenshots.
See merge request STJr/SRB2!324
|
2018-11-13 17:28:29 -05:00 |
|
mazmazz
|
2db2b6e6af
|
Win32 boolean fixes
|
2018-11-13 17:24:19 -05:00 |
|
Steel Titanium
|
95ed3fcf7e
|
Save current renderer to screenshots
|
2018-11-13 17:19:22 -05:00 |
|
mazmazz
|
894ee02f3f
|
Fix x64 build issue
|
2018-11-13 17:12:18 -05:00 |
|
mazmazz
|
2e39e5ffdd
|
Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders
|
2018-11-13 16:43:16 -05:00 |
|
mazmazz
|
ba821056ce
|
Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders
|
2018-11-13 16:40:43 -05:00 |
|
Monster Iestyn
|
e9fe0ebae1
|
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
|
2018-11-13 18:14:59 +00:00 |
|
Monster Iestyn
|
0d38061db8
|
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
|
2018-11-13 18:13:51 +00:00 |
|
Monster Iestyn
|
e85f73117c
|
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
|
2018-11-12 20:07:45 +00:00 |
|
Monster Iestyn
|
c7e58b7cd5
|
Merge branch 'opengl-new-clipping-backport' into 'master'
OpenGL new clipping backport
See merge request STJr/SRB2!315
|
2018-11-10 13:57:16 -05:00 |
|