Monster Iestyn
|
784fc70e7e
|
Merge branch 'fix-gme-free' into 'master'
Fix crash with GME sounds when being freed
See merge request STJr/SRB2!504
|
2019-07-16 13:25:51 -04:00 |
|
Steel Titanium
|
db525c43a7
|
Fix crash with GME sounds when being freed
|
2019-07-14 14:55:04 -04:00 |
|
Steel Titanium
|
5cbf0692d6
|
Merge branch 'morememoryshenanigans' into 'master'
More Memory Shenanigans
See merge request STJr/SRB2!501
|
2019-06-28 18:18:14 -04:00 |
|
Sryder
|
ef9ad551f6
|
Simply truncate the per-map COLORMAP lump instead of not reading it at all.
Keep the warning though.
|
2019-06-23 15:02:32 +01:00 |
|
Sryder
|
d1b0a31e2b
|
Don't overlap strncpy in WAD file load
|
2019-06-23 14:52:49 +01:00 |
|
Sryder
|
1aa03c01dc
|
Change COLORMAP lump size check to be exact
A lower size could technically be valid, but could easily run into strange issues.
|
2019-06-23 13:49:39 +01:00 |
|
Sryder
|
ac80cc3834
|
Kill Texture SOC feature.
As far as I know it's basically unused, and the strstr is inherently unsafe because there's no guarantee that a patch's contents are NULL terminated.
|
2019-06-23 13:48:29 +01:00 |
|
Sryder
|
d491c62c7c
|
Don't read from a per-map COLORMAP if it is too big.
Could this be changed to only read the first so many bytes?
|
2019-06-23 12:47:20 +01:00 |
|
Monster Iestyn
|
4ed81519e8
|
Merge branch 'pk3_leak' into 'master'
Pk3 Leaks
See merge request STJr/SRB2!500
|
2019-06-22 15:56:52 -04:00 |
|
Sryder13
|
19f25e6a8e
|
Free the zentries
|
2019-06-22 00:52:28 +01:00 |
|
Sryder13
|
bf2c82633c
|
Merge branch 'master' into pk3_leak
|
2019-06-22 00:28:14 +01:00 |
|
Sryder13
|
b9a9108dc4
|
Remember to end inflating
|
2019-06-22 00:19:34 +01:00 |
|
Monster Iestyn
|
f079942290
|
Merge branch 'stand(alone)-lump-comedy' into 'master'
Stand(alone) lump comedy
See merge request STJr/SRB2!499
|
2019-06-21 17:06:23 -04:00 |
|
Monster Iestyn
|
f31db6f0d4
|
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
|
2019-06-20 13:24:54 +01:00 |
|
Monster Iestyn
|
6bc4d5a086
|
Merge branch 'apng-opengl' into 'master'
opengl apng fix
See merge request STJr/SRB2!497
|
2019-06-14 13:29:13 -04:00 |
|
Jaime Passos
|
cf7b9ccff4
|
Update m_misc.c
|
2019-06-14 14:13:41 -03:00 |
|
Steel Titanium
|
605e32004a
|
Merge branch '2.1.24-prep' into 'next'
Update version to 2.1.24
See merge request STJr/SRB2!495
|
2019-06-08 17:08:34 -04:00 |
|
Monster Iestyn
|
c21b9e632a
|
Merge branch 'next' into 2.1.24-prep
# Conflicts:
# debian-template/control
# debian/changelog
|
2019-06-07 23:18:31 +01:00 |
|
Alam Ed Arias
|
cd1c87ea71
|
Merge branch 'master' into next
|
2019-06-07 18:07:32 -04:00 |
|
Alam Ed Arias
|
d5c1fe6467
|
Merge branch 'gme-msvc' into 'master'
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
|
2019-06-07 18:06:51 -04:00 |
|
Steel Titanium
|
593fcae69a
|
Merge branch 'next' into 2.1.24-prep
|
2019-06-07 18:02:09 -04:00 |
|
Alam Ed Arias
|
0c352b856d
|
Merge branch 'travis-deployer' into 'master'
Deploy OS X and Debian packages from Travis-CI
See merge request STJr/SRB2!449
|
2019-06-07 17:57:29 -04:00 |
|
Steel Titanium
|
8d5207975d
|
Merge branch 'master' into travis-deployer
# Conflicts:
# .travis.yml
|
2019-06-07 16:56:19 -04:00 |
|
Steel Titanium
|
6c4253a680
|
Merge branch 'jimita-flashpals-on-screenshots' into 'next'
Flashpals on screenshots
See merge request STJr/SRB2!492
|
2019-06-07 16:37:59 -04:00 |
|
Steel Titanium
|
9a6330ca4d
|
Merge branch 'more-limits' into 2.1.24-prep
|
2019-06-07 11:28:43 -04:00 |
|
Monster Iestyn
|
474b70aa69
|
Update version to 2.1.24
|
2019-06-07 15:48:33 +01:00 |
|
Steel Titanium
|
8f19878781
|
Upped freeslots limit
|
2019-06-03 15:23:48 -04:00 |
|
Steel Titanium
|
2e8aae5d6a
|
Merge branch 'next' into jimita-flashpals-on-screenshots
|
2019-05-25 19:37:17 -04:00 |
|
Monster Iestyn
|
c8e3748a1c
|
Merge branch 'master' into next
|
2019-05-13 16:07:30 +01:00 |
|
Monster Iestyn
|
11cc332378
|
Merge branch 'archiveworld-sigsegv-fix' into 'next'
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
|
2019-05-13 07:02:48 -04:00 |
|
Alam Ed Arias
|
be13ab4830
|
Fix NONET build
|
2019-05-13 01:51:36 -04:00 |
|
Steel Titanium
|
2c4555493d
|
Merge branch 'perpetual-modifier-updates' into 'master'
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
|
2019-05-13 00:36:06 -04:00 |
|
Steel Titanium
|
f235f45431
|
Merge branch 'no-frameskip' into 'next'
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
|
2019-05-13 00:35:11 -04:00 |
|
Steel Titanium
|
0f616a7141
|
Properly fix crash due to duplicated lines.
|
2019-05-13 00:23:43 -04:00 |
|
Steel Titanium
|
9ec6d5e653
|
Revert "Check that lumps are okay"
This reverts commit 3f4121085b.
|
2019-05-13 00:20:39 -04:00 |
|
James R
|
3f4121085b
|
Check that lumps are okay
|
2019-05-08 20:30:19 -04:00 |
|
Monster Iestyn
|
5756583612
|
Merge branch 'master' into next
|
2019-05-08 16:31:05 +01:00 |
|
Monster Iestyn
|
2b636ae614
|
Merge branch 'alias_recursion_hotfix_2' into 'master'
Alias recursion hotfix 2
See merge request STJr/SRB2!482
|
2019-05-08 11:25:15 -04:00 |
|
wolfy852
|
93c706bfb8
|
Don't skip frames when connecting or paused
|
2019-05-08 09:39:45 -05:00 |
|
wolfs
|
10b47550a4
|
Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
|
2019-05-07 22:42:13 -04:00 |
|
Monster Iestyn
|
a0e135f1b8
|
Merge branch 'master' into next
|
2019-05-06 19:38:53 +01:00 |
|
Nev3r
|
7a66fabf4f
|
Merge branch 'banip-command' into 'next'
Ban IP command
See merge request STJr/SRB2!460
|
2019-05-06 13:09:14 -04:00 |
|
Nev3r
|
9a43511cf6
|
Merge branch 'console-wait-fix' into 'master'
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
|
2019-05-06 12:56:07 -04:00 |
|
Nev3r
|
809975b1ff
|
Merge branch 'opengl-sprite-billboarding' into 'master'
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
|
2019-05-06 12:45:53 -04:00 |
|
Sryder
|
64fb7f90f0
|
Add a cvar for sprite billboarding, off by default.
|
2019-05-06 16:57:32 +01:00 |
|
Monster Iestyn
|
cbb20fc147
|
Merge branch 'master' into next
|
2019-05-03 16:40:13 +01:00 |
|
Monster Iestyn
|
5cd8ff01ba
|
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
not making a merge request because this is so laughably stupidly simple
|
2019-05-03 16:38:59 +01:00 |
|
Monster Iestyn
|
57edf46531
|
Merge branch 'master' into next
|
2019-05-03 16:00:45 +01:00 |
|
wolfs
|
3d24bf11af
|
Merge branch 'nonet-upnp' into 'master'
Don't enable UPnP support if NONET is defined.
See merge request STJr/SRB2!484
|
2019-05-03 06:40:22 -04:00 |
|
mazmazz
|
d2236a32c3
|
Remove song_length tag search
Because songs without this tag will skiplag when loading.
|
2019-05-02 19:14:23 -04:00 |
|