Sryder
|
d67ea859e3
|
Match CheckClip to software's clipping check in R_AddLine
Has the added benefit of fixing noclip camera for opengl
Unfortunately SkyWalls are kinda broken with this. I'll be looking into them shortly.
|
2019-06-24 20:21:30 +01: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
|
777695aa88
|
Merge branch 'replay-typo' into 'master'
Spell it "forward"
See merge request KartKrew/Kart-Public!147
|
2019-06-23 12:34:07 -04: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 |
|
James R
|
5f4f10fdbe
|
Spell it "forward"
|
2019-06-22 21:40:20 -07: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 |
|
Sryder
|
18e2e4ec8f
|
Merge branch 'fileneededconfig-fix' into 'master'
Fix fileneeded overflow
See merge request KartKrew/Kart-Public!146
|
2019-06-21 13:13:14 -04:00 |
|
James R
|
bbee4a2554
|
Cover edge case of WRITESTRINGN
|
2019-06-20 15:29:55 -07:00 |
|
James R
|
d5e1c1af42
|
Add a comment by Sryder's request
|
2019-06-20 15:24:50 -07:00 |
|
James R
|
7f99ebc692
|
Also count terminating byte in fileneeded filename
|
2019-06-20 15:16:23 -07:00 |
|
Monster Iestyn
|
bc2804d383
|
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
|
2019-06-20 13:24:54 +01:00 |
|
James R
|
ec369e8d21
|
Don't get stuck in room menu in a modified game
|
2019-06-19 14:32:11 -07:00 |
|
Sryder
|
db24665856
|
Merge branch 'print-correct-view' into 'master'
Print the correct player for the view command
See merge request KartKrew/Kart-Public!141
|
2019-06-19 16:58:11 -04:00 |
|
Sryder
|
257ad438ef
|
Merge branch 'nomoreendlessclouds' into 'master'
Stop OpenGL having infinite precipitation draw distance
See merge request KartKrew/Kart-Public!143
|
2019-06-19 16:56:26 -04:00 |
|
Sryder
|
1b46553d43
|
Integer comparison warning
|
2019-06-19 21:54:11 +01:00 |
|
Sryder
|
11c94d3312
|
Stop OpenGL having infinite precipitation draw distance
|
2019-06-19 20:05:20 +01:00 |
|
Sryder
|
987b20e5b6
|
Merge branch 'playerinfo_mscompat' into 'master'
Fix compatibility with the MS (Specifically Doomseeker)
See merge request KartKrew/Kart-Public!142
|
2019-06-19 14:57:41 -04:00 |
|
Sryder
|
935fec1e15
|
Fix compatibility with the MS (Specifically Doomseeker)
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
|
2019-06-17 21:04:48 +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 |
|
James R
|
91c707d6fd
|
Index displayplayers correctly
|
2019-06-10 14:24:11 -07:00 |
|
James R
|
3ffc520a2c
|
Merge remote-tracking branch 'james/ms-connectionfail-fix' into HEAD
|
2019-06-09 14:22:32 -07:00 |
|
James R
|
8589a1ec07
|
Revert "Unfuck MS connecting and error reporting"
This reverts commit 4d739fe7a5.
|
2019-06-09 14:21:04 -07:00 |
|
James R
|
0561a5374c
|
Revert "Check error on select"
This reverts commit aa4ce2b2d1.
|
2019-06-09 14:20:33 -07:00 |
|
James R
|
33b7459c1b
|
Revert "Force of habit"
This reverts commit fc8ebe83fc.
|
2019-06-09 14:20:32 -07: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 |
|
Alam Ed Arias
|
3edf73f181
|
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
|
3c08ee1313
|
Merge branch 'master' into travis-deployer
# Conflicts:
# .travis.yml
|
2019-06-07 16:56:19 -04:00 |
|
Steel Titanium
|
e1d025cd2b
|
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
|
eb99ad0437
|
Merge branch 'more-limits' into 2.1.24-prep
|
2019-06-07 11:28:43 -04:00 |
|