Monster Iestyn
|
c8d1dd3be8
|
P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all!
# Conflicts:
# src/p_maputl.c
|
2019-08-15 14:25:02 +01:00 |
|
Monster Iestyn
|
27dd99ae72
|
Remove commented out P_CheckSector calls and add extra comments explaining the situation
|
2019-08-15 14:21:19 +01:00 |
|
Monster Iestyn
|
8fa54c1ab4
|
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code.
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
|
2019-08-15 14:20:52 +01:00 |
|
Alam Ed Arias
|
81b294eec1
|
Merge branch 'master' into next
|
2019-08-08 23:18:31 -04:00 |
|
Alam Ed Arias
|
0c2b300294
|
Appveyor: other way around, the Mingw32 is at 9.1
|
2019-08-08 23:05:24 -04:00 |
|
Alam Ed Arias
|
33c0b825a7
|
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
|
2019-08-08 23:02:03 -04:00 |
|
Alam Ed Arias
|
268b5a09d9
|
Disable address-of-packed-member warning
|
2019-08-08 22:47:33 -04:00 |
|
Alam Ed Arias
|
eacf89e309
|
Makefile: GCC80 does not exist
|
2019-08-08 22:34:09 -04:00 |
|
Alam Ed Arias
|
b773b61b8c
|
Revert "Try to compile with AppVeyor's GCC 9.1.0"
This reverts commit 749c2753e4 .
|
2019-08-08 22:31:18 -04:00 |
|
Alam Ed Arias
|
749c2753e4
|
Try to compile with AppVeyor's GCC 9.1.0
|
2019-08-08 22:19:22 -04:00 |
|
Alam Ed Arias
|
5a79a446df
|
Tested to be compile with Mingw64 9.1.0
|
2019-08-08 21:25:46 -04:00 |
|
Alam Ed Arias
|
d5cc3ce48d
|
Makefile: support GCC 9.1
|
2019-08-08 20:27:57 -04:00 |
|
Alam Ed Arias
|
07f89fd6b5
|
Makefile: stop building with DWARF v2 debugging info
|
2019-08-08 18:43:42 -04:00 |
|
Alam Ed Arias
|
963d2f5da3
|
Merge branch 'master' into next
|
2019-07-29 18:05:33 -04:00 |
|
Alam Ed Arias
|
66f84efd02
|
SDL2: fixed compiling mixer interface with MSVC
|
2019-07-29 17:56:35 -04:00 |
|
Monster Iestyn
|
6eaf7625a9
|
Merge branch 'master' into next
|
2019-07-16 18:26:46 +01:00 |
|
Monster Iestyn
|
3e708e62e8
|
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
|
4e839596a1
|
Fix crash with GME sounds when being freed
|
2019-07-14 14:55:04 -04:00 |
|
Monster Iestyn
|
3a9ce483f5
|
Merge branch 'master' into next
# Conflicts:
# src/r_data.c
|
2019-06-28 23:24:36 +01:00 |
|
Steel Titanium
|
2c906e9c29
|
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
|
47eb711097
|
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
|
f7357a02ae
|
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
|
016f1fe533
|
Merge branch 'morememoryshenanigans' into 'master'
More Memory Shenanigans
See merge request STJr/SRB2!501
|
2019-06-28 18:18:14 -04:00 |
|
Monster Iestyn
|
826e8e1aaf
|
Fixed goofups I missed back 3 months ago
|
2019-06-23 17:51:58 +01:00 |
|
Monster Iestyn
|
d9ca8b45d3
|
Saving work so far, UNTESTED
# Conflicts:
# src/r_data.c
|
2019-06-23 17:51:36 +01:00 |
|
Sryder
|
8a778a4070
|
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
|
5f339fc2a9
|
Don't overlap strncpy in WAD file load
|
2019-06-23 14:52:49 +01:00 |
|
Sryder
|
bb9b1b3b1f
|
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
|
bc254d9cf7
|
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
|
45922f80d1
|
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
|
c9456e141d
|
Merge branch 'master' into next
|
2019-06-22 22:42:13 +01:00 |
|
Monster Iestyn
|
755e4a8b2c
|
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
|
1af969d579
|
Merge branch 'pk3_leak' into 'master'
Pk3 Leaks
See merge request STJr/SRB2!500
|
2019-06-22 15:56:52 -04:00 |
|
Sryder13
|
8444379d53
|
Free the zentries
|
2019-06-22 00:52:28 +01:00 |
|
Sryder13
|
83da71f809
|
Merge branch 'master' into pk3_leak
|
2019-06-22 00:28:14 +01:00 |
|
Sryder13
|
dcd4995eb3
|
Remember to end inflating
|
2019-06-22 00:19:34 +01:00 |
|
Monster Iestyn
|
f84c898040
|
Merge branch 'master' into next
|
2019-06-21 22:10:32 +01:00 |
|
Monster Iestyn
|
fb182369f6
|
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
|
04215b732e
|
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
|
bc2804d383
|
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
|
2019-06-20 13:24:54 +01:00 |
|
Monster Iestyn
|
62ed90b252
|
fix type mismatch by typecasting
|
2019-06-17 20:54:06 +01:00 |
|
Monster Iestyn
|
1638fad75e
|
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
|
50e8f13c03
|
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
|
96b12f098b
|
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
|
c591633733
|
Update m_misc.c
|
2019-06-14 14:13:41 -03:00 |
|
Steel Titanium
|
bfa7325295
|
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
|
f5d883bd12
|
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
|
ea08ba3fba
|
Merge branch 'master' into next
|
2019-06-07 18:07:32 -04:00 |
|
Alam Ed Arias
|
83b8a98df4
|
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
|
c0c1e5416f
|
Merge branch 'next' into 2.1.24-prep
|
2019-06-07 18:02:09 -04:00 |
|