Nev3r
f360e3431c
Revamped the lumpinfo_t array generation code.
...
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
48cf6572b3
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
Nev3r
206d411f46
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
Nev3r
623c7097f1
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
Monster Iestyn
8eae64b38e
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
07f45a954c
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
3cbe8b26b5
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
Monster Iestyn
22835af9e1
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
8da74cb193
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
1ff6cb01c7
Travis-CI: allow GCC 8.x to fail
2018-11-18 21:25:33 -05:00
Alam Ed Arias
674d31e808
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
Alam Ed Arias
6b3616aee6
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
Alam Ed Arias
dbf6884b37
We need to include the NUL char
2018-11-18 20:21:32 -05:00
Alam Ed Arias
913e6aeeb7
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
Monster Iestyn
07fc73dbad
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
e1f7717f24
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
b912008c41
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
Monster Iestyn
dbb308e284
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
15a70109ae
Add missing 64-bit libgme dll
2018-11-15 13:30:59 -05:00
Steel Titanium
a84c49d7d6
Some small changes
2018-11-14 21:01:54 -05:00
Steel Titanium
ae2b331a11
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
Steel Titanium
a817c84836
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
Alam Ed Arias
8277f32b67
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
Monster Iestyn
d366ee76b6
Merge branch 'master' into next
2018-11-14 21:49:11 +00:00
Monster Iestyn
9e3e9a3248
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
270ec5e2b9
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
e2249b3f08
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
f2f02c6095
TravisCI: test build on GCC 8.x
2018-11-14 15:56:46 -05:00
Alam Ed Arias
aef0d9a421
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
MonsterIestyn
0ea835058c
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
44646db6af
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
Monster Iestyn
4e86572285
Merge branch 'master' into next
2018-11-14 18:01:31 +00:00
Monster Iestyn
a0bec73904
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
16451363b9
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
525bd219b6
Merge branch 'master' into next
2018-11-14 11:07:12 -05:00
Alam Ed Arias
05afaa586e
Fix misleading indentation
2018-11-14 11:06:45 -05:00
Alam Ed Arias
3bd88acf25
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
fbb28ba1b5
Cleanup whitespace
2018-11-14 10:54:33 -05:00
Alam Ed Arias
a4726ee0b7
Merge branch 'master' into next
2018-11-14 10:52:49 -05:00
Alam Ed Arias
45c8920bb1
Clean up warnings
2018-11-14 10:52:16 -05:00
Marco Z
999a03aada
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
Marco Z
f5fe8c46fa
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
Monster Iestyn
3350096b2f
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Monster Iestyn
fabcb3d842
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
af0fdfe6e5
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
mazmazz
98ba84f50d
Add SDL Mixer 2.0.4 VC package
2018-11-13 22:05:05 -05:00
mazmazz
b438361869
Add SDL 2.0.9 VC package
2018-11-13 22:02:18 -05:00
Steel Titanium
be3fac2908
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
Monster Iestyn
0c0cbb3b00
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