Alam Ed Arias
|
1ae3ad733b
|
Merge branch 'master' into next
|
2019-08-08 23:18:31 -04:00 |
|
Alam Ed Arias
|
cb5b7a5555
|
Appveyor: other way around, the Mingw32 is at 9.1
|
2019-08-08 23:05:24 -04:00 |
|
Alam Ed Arias
|
4d1c2b4de0
|
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
|
2019-08-08 23:02:03 -04:00 |
|
Alam Ed Arias
|
abe1d9809f
|
Disable address-of-packed-member warning
|
2019-08-08 22:47:33 -04:00 |
|
Alam Ed Arias
|
5b692acc6c
|
Makefile: GCC80 does not exist
|
2019-08-08 22:34:09 -04:00 |
|
Alam Ed Arias
|
64159d55cf
|
Revert "Try to compile with AppVeyor's GCC 9.1.0"
This reverts commit 9fc6c3b136.
|
2019-08-08 22:31:18 -04:00 |
|
Alam Ed Arias
|
9fc6c3b136
|
Try to compile with AppVeyor's GCC 9.1.0
|
2019-08-08 22:19:22 -04:00 |
|
Alam Ed Arias
|
5c0912bab1
|
Tested to be compile with Mingw64 9.1.0
|
2019-08-08 21:25:46 -04:00 |
|
Alam Ed Arias
|
e2927ffe2c
|
Makefile: support GCC 9.1
|
2019-08-08 20:27:57 -04:00 |
|
Alam Ed Arias
|
2c7fbe2087
|
Makefile: stop building with DWARF v2 debugging info
|
2019-08-08 18:43:42 -04:00 |
|
Alam Ed Arias
|
82c4cdfaca
|
Merge branch 'master' into next
|
2019-07-29 18:05:33 -04:00 |
|
Alam Ed Arias
|
62e45e5f5b
|
SDL2: fixed compiling mixer interface with MSVC
|
2019-07-29 17:56:35 -04:00 |
|
Monster Iestyn
|
f563f95c32
|
Merge branch 'master' into next
|
2019-07-16 18:26:46 +01:00 |
|
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 |
|
Monster Iestyn
|
9933f98dc2
|
Merge branch 'master' into next
# Conflicts:
# src/r_data.c
|
2019-06-28 23:24:36 +01:00 |
|
Steel Titanium
|
1a4d1b670d
|
Merge branch 'jimita-unfuck-awayview' into 'next'
unfuck awayview
See merge request STJr/SRB2!493
|
2019-06-28 18:21:52 -04:00 |
|
Steel Titanium
|
8a80426408
|
Merge branch 'public-musicplus-feature-endoflevel' into 'next'
Fade out music at end of level, before intermission
See merge request STJr/SRB2!472
|
2019-06-28 18:21:07 -04:00 |
|
Steel Titanium
|
55d09de2ee
|
Merge branch 'pk3-folders-are-not-textures-backport' into 'next'
Pk3 folders are not textures!
See merge request STJr/SRB2!502
|
2019-06-28 18:18:53 -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 |
|
Monster Iestyn
|
9c9b674262
|
Fixed goofups I missed back 3 months ago
|
2019-06-23 17:51:58 +01:00 |
|
Monster Iestyn
|
fea05ff9c5
|
Saving work so far, UNTESTED
# Conflicts:
# src/r_data.c
|
2019-06-23 17:51:36 +01: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
|
fe633a9f57
|
Merge branch 'master' into next
|
2019-06-22 22:42:13 +01:00 |
|
Monster Iestyn
|
1e29d627f0
|
Merge branch 'make-credits-great-again' into 'next'
Prevent just anyone from skipping credits but allow admins
See merge request STJr/SRB2!478
|
2019-06-22 16:13:04 -04: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
|
cfa13f3fe4
|
Merge branch 'master' into next
|
2019-06-21 22:10:32 +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
|
c5a993b9b5
|
Merge branch 'fof-slopes-level-load-fix' into 'next'
FOF slopes level load fix
See merge request STJr/SRB2!498
|
2019-06-21 17:05:54 -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
|
d1901a2030
|
fix type mismatch by typecasting
|
2019-06-17 20:54:06 +01:00 |
|
Monster Iestyn
|
4b5457ea74
|
Part 2 of fix, make sure copied slopes also pass on hasslope status to attached target sectors for FOFs
Also fix whitespace to use tab-style spaces instead of regular spaces, ew
|
2019-06-17 19:00:04 +01:00 |
|
Monster Iestyn
|
6dd39fa83b
|
Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation
|
2019-06-17 18:46:51 +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 |
|