stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
8115 commits 172 branches 41 tags 285 MiB
Commit graph

8115 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
1a1f4136e8 Fix character select menu to use the new Color_Opposite array. 2019-08-20 19:08:45 -03:00
Jaime Passos
403eafb003 Merge remote-tracking branch 'origin/master' into newmenus 2019-08-20 19:07:34 -03:00
Steel Titanium
6ef9ee5467 true not TRUE 2019-08-20 15:43:59 -04: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
2dd5f1abe3 Fixes for lib_cvRegisterVar (the Lua version of CV_RegisterVar): 
* Make sure the consvar's properties are all initialised to zeros as defaults
* Error if the consvar is not given a name
* Error if the consvar has CV_CALL but no call function
* Error if the consvar has CV_NOINIT but not CV_CALL
 2019-08-20 18:18:29 +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
Steel Titanium
5ef4b938be
Draw record attack foreground even if a message is currently on-screen. 2019-08-20 00:15:35 -04:00
Jaime Passos
12a6479521 Unlock all cached patches, fix accidental merge conflict. 2019-08-20 00:41:06 -03:00
Jaime Passos
d59febb5aa Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus 2019-08-20 00:21:28 -03:00
Jaime Passos
e4e3af7be0 Remove new character select screen transitions. 
I should not have implemented it in the first place.
 2019-08-20 00:18:34 -03:00
Jaime Passos
61866f326a New Record Attack menu. 2019-08-20 00:12:22 -03:00
Steel Titanium
15b363773f
Fix record attack foreground not appearing. 
I'm not sure why it suddenly broke when the same condition worked before.
 2019-08-19 22:10:52 -04:00
Jaime Passos
e2dde4412d Fix character description text rendering. 2019-08-19 18:49:23 -03:00
Jaime Passos
5290f4c80b Cool defines 2019-08-19 16:19:25 -03:00
Jaime Passos
15957bf13f hghdfhdjhdhkdlfh 2019-08-19 15:34:12 -03:00
Jaime Passos
94e21c7b03 slight cleanup 2019-08-19 15:27:20 -03:00
Jaime Passos
29dc1119e5 uh 2019-08-19 14:43:48 -03:00
Jaime Passos
85499040d3 did The Thing 2019-08-19 14:23:03 -03:00
Jaime Passos
381258883e More character select work 2019-08-18 22:26:52 -03:00
Jaime Passos
f13a014c4c Tweak Record Attack screen just a little bit 2019-08-18 20:35:16 -03:00
Jaime Passos
6a66057a60 how do i code 2019-08-18 19:46:55 -03:00
Jaime Passos
feac7b56ec Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus 2019-08-18 19:35:14 -03:00
Jaime Passos
778461028e Character select WIP 2019-08-18 19:34:54 -03:00
Steel Titanium
59cdfa8e27
New music for record attack and nights attack menus 2019-08-18 17:32:52 -04:00
Steel Titanium
fe11620b60
Merge branch 'newmenus' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus 2019-08-18 13:49:08 -04:00
Steel Titanium
a40d5a2a45
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus 2019-08-18 13:46:50 -04:00
Jaime Passos
5e11c5fbe7 Merge remote-tracking branch 'origin/master' into newmenus 2019-08-18 14:46:34 -03:00
Steel Titanium
165ade339b
Update libpng and zlib 2019-08-18 13:21:20 -04:00
Jaime Passos
f68652aa66 I 2019-08-18 14:16:48 -03: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