stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-12 13:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity
6756 commits 172 branches 41 tags 242 MiB
Commit graph

6756 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
41d5ffa17f Fix OpenGL renderer crash with -skipintro command line parameter. 2019-08-20 20:21:53 -03:00
Monster Iestyn
eacc589ae1 Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437) 2019-08-20 20:31:28 +01:00
Monster Iestyn
7f5034bb75 Merge branch 'mi-cleanup-returns' into 'master' 
MI cleanup returns

See merge request STJr/SRB2Internal!292
 2019-08-20 09:35:36 -04:00
Monster Iestyn
54dbd7b4c1 Merge branch 'landingbetter' into 'master' 
Fix all our landing woes. (For now.)

See merge request STJr/SRB2Internal!289
 2019-08-20 09:28:40 -04:00
Monster Iestyn
03ce0adef8 Remove references to old console ports that slipped in from the 2.1 source code a while back 2019-08-20 14:13:38 +01:00
Monster Iestyn
f3484f7ded 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
c50831f875 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
9a4a90c9cb 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
9c1fa867fa Include md5.h 2019-08-17 10:34:19 -07:00
James R
c1ba72ead8 Remove a printf 2019-08-17 10:33:33 -07:00
James R
19dd9a3c14 Kart discrepancies 2019-08-17 10:33:14 -07:00
Monster Iestyn
0949406b9c Update MD5 for patch.dta 2019-08-17 18:15:23 +01:00
Monster Iestyn
450ea0cc43 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
e52a314ddb Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Monster Iestyn
99f04f1d89 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
ae9ecef592 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
392cb89ff4 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
5c2786b163 Make the various carry types' handling code into a switch case 2019-08-15 18:02:30 +01:00
Monster Iestyn
d55790097f split MT_TAILSOVERLAY handling code into a function of its own, since there's so much of it 
# Conflicts:
#	src/p_user.c
 2019-08-15 18:02:22 +01:00
Monster Iestyn
bbefc3b7f4 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
cda81cc166 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
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
Monster Iestyn
f5332ccf8e Fixed TC_RAINBOW so it doesn't accept invalid colors, whoopsies 2019-08-12 19:06:18 +01:00
Monster Iestyn
0685b9705c Initialise player_names[] in D_RegisterClientCommands such that we don't need to have to manually update it if MAXPLAYERS ever changed 2019-08-12 15:18:36 +01:00
Monster Iestyn
b7a2b3f7a2 Added switch cases to skin color related functions in r_draw.c, added extra error checking 2019-08-12 15:02:36 +01:00
Monster Iestyn
7ba4bbf867 Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua 2019-08-12 14:00:26 +01:00
Monster Iestyn
37dd048f12 tweak the defaults for titlescrollxspeed and numDemos 2019-08-11 22:28:32 +01:00
Monster Iestyn
92b47f8729 Fix uninitialised variable error toaster found in P_MinecartThink 2019-08-11 22:14:50 +01:00
Monster Iestyn
0ba2b28381 Disable patch.dta at Rob's request, since we don't really use it anymore 2019-08-11 20:24:14 +01:00
toaster
f85bc7c61f Fix Rob's Knuckles issue. 2019-08-11 19:37:15 +01:00
toaster
ed8ad7abde Did some testing, needed to fix one more issue with moving surfaces and spinning. 2019-08-11 14:36:52 +01:00
toaster
e3aec8e067 Fix all our landing woes. (For now.) 
* Player state upon collision with ground after rolling now sets state properly.
* Fix the thing where Knuckles can glide up a slope like it's nothing WHILE keeping things working for bouncers.
 2019-08-10 16:06:59 +01:00
Monster Iestyn
24526d4758 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
fd77fe819b curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
Alam Ed Arias
92a954609d Merge branch 'public_next' into private 2019-08-08 23:41:19 -04: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
Monster Iestyn
1b9eb3c3e4 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
17e53ee27b 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
a8b7ecab4d 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