stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
6796 commits 174 branches 41 tags 300 MiB
Commit graph

6796 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
4adff34402 opengl patch translucency 2019-09-07 22:43:29 -03:00
Monster Iestyn
c6af108d8c Merge branch 'musicfixes' into 'master' 
Minor musicplus-related fixes

See merge request STJr/SRB2Internal!310
 2019-09-07 11:45:15 -04:00
Monster Iestyn
d998dad2ad Merge branch 'stop-bullying-tails' into 'master' 
Ignore bots when looking for a player

Closes #190

See merge request STJr/SRB2Internal!301
 2019-09-07 11:44:46 -04:00
Monster Iestyn
a287b9e317 Merge branch 'fix_skipintro' into 'master' 
Fix -skipintro in OpenGL

See merge request STJr/SRB2Internal!308
 2019-09-07 11:44:09 -04:00
Monster Iestyn
52a4b77f83 Merge branch 'devmode-toggletwod' into 'master' 
DEVMODE: 2D toggle command

See merge request STJr/SRB2Internal!309
 2019-09-07 11:43:01 -04:00
toaster
92b77c987b Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!) 2019-09-07 12:10:50 +01:00
toaster
cf4b5a1b9d * Comment out the notices that the two types of music are disabled (see issue #179; not a perfect fix, but good enough for now). 2019-09-07 11:49:13 +01:00
toaster
54b89eefbb * Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations). 2019-09-07 11:48:58 +01:00
Steel Titanium
bc52bc83cc
2D toggle command 2019-09-06 20:51:39 -04:00
Jaime Passos
de4a609421 Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-06 16:08:18 -03:00
Monster Iestyn
4c39225c3e Merge branch 'public_next' 2019-09-03 19:07:57 +01:00
Jaime Passos
6b151ef4ea Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-02 23:36:15 -03:00
Monster Iestyn
602154fe8b Merge branch 'ring-penalty-graphic' into 'master' 
Weapon ammo penalty indicator

See merge request STJr/SRB2Internal!297
 2019-08-30 13:28:05 -04:00
Alam Ed Arias
028996915d Merge branch 'master' into next 2019-08-29 19:28:02 -04:00
Alam Ed Arias
dadec1196b Warn on implicit fallthrough 2019-08-29 19:27:52 -04:00
Steel Titanium
1040a93a6e
Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
Steel Titanium
121d8b7838 Merge branch 'abpolish' into 'master' 
Autobrake polish

Closes #176

See merge request STJr/SRB2Internal!293
 2019-08-28 00:34:21 -04:00
James R
89c4989987 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Monster Iestyn
ab90526541 Merge branch 'candamagefix' into 'master' 
P_PlayerCanDamage fix

See merge request STJr/SRB2Internal!291
 2019-08-26 11:32:10 -04:00
Monster Iestyn
db3a2e02a5 Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively 2019-08-25 22:24:08 +01:00
Monster Iestyn
d1105abdb3 Merge branch 'public_next' 
# Conflicts:
#	src/d_netfil.c
 2019-08-25 18:18:59 +01:00
Monster Iestyn
964693d542 Merge branch 'master' into next 2019-08-24 23:28:38 +01:00
Monster Iestyn
7a199748b9 Merge branch 'based-files' into 'master' 
Compare the file name only for real

See merge request STJr/SRB2!511
 2019-08-24 15:51:11 -04:00
Monster Iestyn
7090413417 Merge branch 'calling-all-lua-consvars' into 'next' 
Calling all Lua consvars

See merge request STJr/SRB2!509
 2019-08-24 15:50:43 -04:00
James R
e5071bb605 Compare the file name only for real 
CL_SendRequestFile prepends the path for each file.
 2019-08-23 11:00:05 -07:00
Monster Iestyn
9d2e7b66ba Merge branch 'gfz_boss_rework' into 'master' 
GFZ boss rework + boss explosion fun

See merge request STJr/SRB2Internal!290
 2019-08-22 11:27:24 -04:00
toaster
fc1abdd7f8 Autobrake polish! 
* Make it actually look like a brake, so people can tell it's on instead of just having high friction.
* Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
 2019-08-22 16:13:00 +01:00
Jaime Passos
41d5ffa17f Fix OpenGL renderer crash with -skipintro command line parameter. 2019-08-20 20:21:53 -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
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