Commit graph

6933 commits

Author SHA1 Message Date
toaster
0700ad229f Lots of death stuff.
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00
toaster
226a23c90b Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3) 2019-09-01 11:43:30 +01:00
toaster
b2d57e6045 Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it. 2019-08-30 19:19:54 +01:00
Monster Iestyn
7f1e13b746 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
Steel Titanium
2821ec1807 Rename private mode to unlisted mode 2019-08-30 00:38:58 -04:00
Steel Titanium
4f71e2a3b0 Capitalize the 'if' 2019-08-30 00:36:10 -04:00
Steel Titanium
4d94c0b1ac Fix spawning within random range 2019-08-29 23:56:15 -04:00
Alam Ed Arias
475e2fa981 Merge branch 'master' into next 2019-08-29 19:28:02 -04:00
Alam Ed Arias
d6a3f3f4d8 Warn on implicit fallthrough 2019-08-29 19:27:52 -04:00
Steel Titanium
9fcf7695c0 Add spawn object linedef special.
Note that spawning a object within a random range does not fully work yet and crashes the game
2019-08-29 01:57:58 -04:00
Steel Titanium
e86484a64a Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
Steel Titanium
3f9076fd80 Merge branch 'master' into mprelated-tweaks 2019-08-28 22:26:52 -04:00
Steel Titanium
9f197df5e9 Add warning message when attempting to use the master server browser while modifiedgame is true. 2019-08-28 20:24:30 -04:00
Steel Titanium
3a08761a8f Merge branch 'abpolish' into 'master'
Autobrake polish

Closes #176

See merge request STJr/SRB2Internal!293
2019-08-28 00:34:21 -04:00
Steel Titanium
1ae5987502 Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
Steel Titanium
27e125e782 Allow letters to be used on ipv4 address field 2019-08-26 22:00:07 -04:00
Steel Titanium
74bcfda7dd Reorder the main multiplayer menu 2019-08-26 21:49:12 -04:00
Steel Titanium
2fc5ee0ec3 Move some cvars out of D_ClientServerInit and save them
Ported over from Kart
2019-08-26 20:38:32 -04:00
James R
d51b516446 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Monster Iestyn
4416be5def Merge branch 'candamagefix' into 'master'
P_PlayerCanDamage fix

See merge request STJr/SRB2Internal!291
2019-08-26 11:32:10 -04:00
Monster Iestyn
e5c46e9b18 Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively 2019-08-25 22:24:08 +01:00
Monster Iestyn
a7353a9835 Merge branch 'public_next'
# Conflicts:
#	src/d_netfil.c
2019-08-25 18:18:59 +01:00
Monster Iestyn
7a5263e1a0 Merge branch 'master' into next 2019-08-24 23:28:38 +01:00
toaster
ef055773e7 Fix range print for getter error (setter was caught ahead of time) 2019-08-24 22:56:20 +01:00
Steel Titanium
efd2d4a499 Fallback graphic for firework display, if the character lacks one. 2019-08-24 17:17:55 -04:00
Monster Iestyn
68c94ab194 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
59931b6bfd 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
toaster
8b045a8f15 Lua save-banks!
* Array of 8 INT32's natively embedded into savedata (net and SP)!
* Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game.
* Requires reservation to avoid clobber-conflicts.
    * Access via `reserveLuabanks()` - returns a read-write userdata.
    * Assign userdata to local variable or global rawset to use later.

Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 18:25:27 +01:00
James R
30d7cf0fb5 Compare the file name only for real
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
toaster
4c206bbcb7 Make polyobjects agree with sector lighting/colormap like a FOF.
Caution: has weird retry/reload bug. Ask sphere for sample map/coords.
2019-08-22 22:30:36 +01:00
Monster Iestyn
5035443dc8 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
c7ea762cf1 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
7a861b909a Fix OpenGL renderer crash with -skipintro command line parameter. 2019-08-20 20:21:53 -03:00
Steel Titanium
c18ec4774e true not TRUE 2019-08-20 15:43:59 -04:00
Monster Iestyn
7be7d86ff5 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
fa76579a1b 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
ebfa40c004 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
6f9fbd0ddf 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
31c5917347 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
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