Jaime Passos
|
d9b7e17b7c
|
Merge pull request #18 from STJr/flats-png
Merge upstream's master into flats-png
|
2019-07-25 16:39:00 -03:00 |
|
Alam Ed Arias
|
aedcd8b0b9
|
Merge remote-tracking branch 'origin/master' into flats-png
|
2019-07-24 19:07:36 -04:00 |
|
Alam Ed Arias
|
6ea1501edc
|
Merge commit 'd491c62c7c16593b1e050ec5735bec53aa7948d3' into flats-png
|
2019-07-24 18:17:01 -04: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 |
|
Jaime Passos
|
59d5ad193c
|
something something memory leaks
|
2019-06-28 19:43:37 -03: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 |
|
Jaime Passos
|
c32e1d2f96
|
Merge remote-tracking branch 'origin/flats' into flats-png
|
2019-06-25 16:04:24 -03:00 |
|
Jaime Passos
|
e0622c4489
|
Merge remote-tracking branch 'upstream/master' into flats-png
|
2019-06-25 16:02:35 -03:00 |
|
Jaime Passos
|
ea9853a3e8
|
Fix slope flat offsets
|
2019-06-25 14:58:34 -03:00 |
|
Jaime Passos
|
48c1fcd731
|
Delete R_CropFlat
|
2019-06-25 14:41:07 -03:00 |
|
Jaime Passos
|
9cc870931a
|
hHA
|
2019-06-25 14:40:00 -03:00 |
|
Jaime Passos
|
5a9bc30a5d
|
Merge remote-tracking branch 'upstream/master' into flats
|
2019-06-25 12:56:03 -03: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 |
|
Jaime Passos
|
75165ebb28
|
PNG support
|
2019-05-26 23:37:23 -03:00 |
|
Jaime Passos
|
666d20c9e3
|
Hardware renderer: Fix polyobjects
|
2019-05-26 18:16:13 -03:00 |
|
Jaime Passos
|
d0c295f44f
|
Hardware renderer: Disable Glide-specific texture handling
|
2019-05-26 17:41:10 -03:00 |
|
Jaime Passos
|
6019cf64e8
|
Merge remote-tracking branch 'upstream/jimita-flats' into flats
|
2019-05-26 16:43:33 -03:00 |
|
Jaime Passos
|
5e19cacb39
|
Minor fixes
|
2019-05-26 16:22:33 -03:00 |
|
Nev3r
|
0d2e50bd26
|
Permit textures to use the "TEXTURE" tag in addition to "WALLTEXTURE".
It's pointless to make any distinctions anymore IMO, given flats can load them just fine now.
|
2019-05-26 12:02:43 +02:00 |
|
Steel Titanium
|
2e8aae5d6a
|
Merge branch 'next' into jimita-flashpals-on-screenshots
|
2019-05-25 19:37:17 -04:00 |
|
Jaime Passos
|
62547b2a49
|
Animations, better flat management.
|
2019-05-21 15:24:26 -03:00 |
|
Jaime Passos
|
83bef14a5a
|
Fix warnings
|
2019-05-21 11:03:53 -03:00 |
|
Jaime Passos
|
7ffb6bb09b
|
HOLD UP
|
2019-05-21 09:50:39 -03:00 |
|
Jaime Passos
|
775b64f540
|
Support for patches and textures to be used in place of sector flats
Still a work in progress.
|
2019-05-21 00:28:52 -03: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 |
|