thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3292 commits 1 branch 12 tags 205 MiB
Commit graph

3292 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
a20079e410 Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Monster Iestyn
8106370fe7 Merge branch 'polyobj-crush-fix-mi' into 'next' 
PolyObject crush hotfix

See merge request STJr/SRB2!506
 2019-08-16 12:04:56 -04:00
Monster Iestyn
f993d74e63 Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges 2019-08-16 14:54:01 +01:00
Monster Iestyn
41dec6e220 Merge branch 'polyobj-fixes-backport' into 'next' 
PolyObject fixes backport

See merge request STJr/SRB2!505
 2019-08-15 13:51:46 -04:00
Monster Iestyn
9d19883646 After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all. 
(Naturally I did the same to the camera equivalent)

# Conflicts:
#	src/p_maputl.c
 2019-08-15 14:30:10 +01:00
Monster Iestyn
c1ff9f8c64 Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised. 
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.

# Conflicts:
#	src/p_maputl.c
 2019-08-15 14:28:06 +01:00
Monster Iestyn
4d3057ff7a 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
845b657ac1 Remove commented out P_CheckSector calls and add extra comments explaining the situation 2019-08-15 14:21:19 +01:00
Monster Iestyn
925c9dc5d8 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
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