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
6742 commits 1 branch 12 tags 205 MiB
Commit graph

6742 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
0b6a463cff Merge branch 'public_next' 
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-08-20 13:54:48 +01:00
Monster Iestyn
4f12b4dfed Merge branch '2.1.25-prep' into 'next' 
Update version to 2.1.25

See merge request STJr/SRB2!507
 2019-08-17 14:07:04 -04:00
Monster Iestyn
42eaa1ed39 Merge branch 'netcode-exploits' into 'next' 
Fix an exploit where players could steal the final hash of a login

See merge request STJr/SRB2!508
 2019-08-17 14:05:20 -04:00
James R
abf06098da Include md5.h 2019-08-17 10:34:19 -07:00
James R
f335519007 Remove a printf 2019-08-17 10:33:33 -07:00
James R
f69983c010 Kart discrepancies 2019-08-17 10:33:14 -07:00
Monster Iestyn
361332b888 Update MD5 for patch.dta 2019-08-17 18:15:23 +01:00
Monster Iestyn
fcc2a8014c Disable the level end music fade code for now, because we discovered it causes freezes sometimes. 2019-08-16 23:19:43 +01:00
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
Monster Iestyn
fac04cf853 tweak the defaults for titlescrollxspeed and numDemos 2019-08-11 22:28:32 +01:00
Monster Iestyn
33277fbbd3 Fix uninitialised variable error toaster found in P_MinecartThink 2019-08-11 22:14:50 +01:00
Monster Iestyn
400cc8124a Disable patch.dta at Rob's request, since we don't really use it anymore 2019-08-11 20:24:14 +01:00
Monster Iestyn
d52a0365da Merge branch 'polyobj-collide-fix' into 'master' 
Polyobject collide fix

See merge request STJr/SRB2Internal!288
 2019-08-09 14:30:44 -04:00
Alam Ed Arias
06b339f6ae curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
Alam Ed Arias
01020ae65f Merge branch 'public_next' into private 2019-08-08 23:41:19 -04: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
Monster Iestyn
816d67c9ff 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)
 2019-08-08 23:04:47 +01:00
Monster Iestyn
d9a78308fe 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.
 2019-08-08 16:37:09 +01:00
Monster Iestyn
7940edd1fc 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! 
(This is an untested fix for VAda's apparent collision with thin air below a polyobject in ACZ2 in beta 5)
 2019-08-07 23:27:26 +01:00
MascaraSnake
ff5d1e7757 Merge branch 'fang-fixes' into 'master' 
Fang fixes

Closes #154 and #140

See merge request STJr/SRB2Internal!285
 2019-08-07 14:46:02 -04:00
MascaraSnake
09b49e729c Merge branch 'fixme' into 'master' 
Build fixes

See merge request STJr/SRB2Internal!287
 2019-08-07 14:45:41 -04:00
MascaraSnake
51badb96c6 Merge branch 'musicplus-strtok' into 'master' 
Use strtok instead of strtok_r

See merge request STJr/SRB2Internal!286
 2019-08-07 14:34:25 -04:00
Alam Ed Arias
9d5abfcee0 Fix compiling without MixerX support 2019-08-07 12:42:07 -04:00
Alam Ed Arias
58a074db26 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
Alam Ed Arias
f546dced92 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
Alam Ed Arias
88445e72c4 fix PARANOIA builds 2019-08-07 12:39:04 -04:00
mazmazz
0d38d7087b Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
MascaraSnake
c6b49391c9 Set Fang's minimum bounce strength to 1.5 times jump strength 2019-08-06 23:35:20 +02:00
MascaraSnake
3786604203 Don't zero out momz when landing on slopes. 
This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.
 2019-08-06 23:18:53 +02:00
toaster
da848d5216 Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing. 
(MI said I could commit to master since it was only a single line.)
 2019-08-04 19:11:58 +01:00
toaster
9cdeee5b84 Merge branch 'revert_revert_musicplus' into 'master' 
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
 2019-08-04 13:58:01 -04:00
toaster
1425185804 Merge branch 'ringsparkle' into 'master' 
New ring sparkles

See merge request STJr/SRB2Internal!271
 2019-08-04 11:46:40 -04:00
Steel Titanium
7dfe696819 Last min changes 2019-08-04 11:34:55 -04:00