Commit graph

7485 commits

Author SHA1 Message Date
Steel Titanium
1ae5987502 Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
MascaraSnake
9e132e0fc1 Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states 2019-08-27 19:33:54 +02: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
Jaime Passos
740deea181 Don't draw borders or patches if not necessary. 2019-08-26 20:49:04 -03:00
James R
d51b516446 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Jaime Passos
129fc6d3ae Merge remote-tracking branch 'origin/master' into newmenus 2019-08-26 19:32:44 -03: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
MascaraSnake
6e575b2c1c Only spawn lavafall rocks if a player is nearby 2019-08-25 23:43:07 +02:00
MascaraSnake
5c1189ef4d Added reverse gravity support to lavafalls 2019-08-25 23:31:12 +02: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
MascaraSnake
b50da9e3e6 Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake
696911e63e Rejig the thing type numbers 2019-08-25 20:01:08 +02:00
Monster Iestyn
a7353a9835 Merge branch 'public_next'
# Conflicts:
#	src/d_netfil.c
2019-08-25 18:18:59 +01:00
MascaraSnake
b78ef0f666 Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02: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
MascaraSnake
d0879a61e6 Green Snapper: Update Z position of legs during movement 2019-08-24 20:23:28 +02: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
MascaraSnake
1538ca7e86 Green Snapper: Use TryMove instead of TeleportMove for the head, so it doesn't snap up to higher floors. 2019-08-24 11:29:08 +02: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
6b4a86d31b NiGHTS Attack menu: Let patch offsets control the alignment of the top border. 2019-08-20 21:45:55 -03:00
James R
06c441703f Old string drawing functions are dumb 2019-08-20 16:33:39 -07:00
Jaime Passos
7a861b909a Fix OpenGL renderer crash with -skipintro command line parameter. 2019-08-20 20:21:53 -03:00
Jaime Passos
4fa44a16c0 Fix character select menu to use the new Color_Opposite array. 2019-08-20 19:08:45 -03:00
Jaime Passos
92817a8991 Merge remote-tracking branch 'origin/master' into newmenus 2019-08-20 19:07:34 -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
Steel Titanium
997b6bb9d3 Draw record attack foreground even if a message is currently on-screen. 2019-08-20 00:15:35 -04:00
Jaime Passos
2460f670f7 Unlock all cached patches, fix accidental merge conflict. 2019-08-20 00:41:06 -03:00
Jaime Passos
3da02a2056 Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus 2019-08-20 00:21:28 -03:00
Jaime Passos
4b13ba15c9 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
fb889d3d1a New Record Attack menu. 2019-08-20 00:12:22 -03:00
Steel Titanium
1491d68122 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
a37caff23e Fix character description text rendering. 2019-08-19 18:49:23 -03:00
Jaime Passos
42590d5aff Cool defines 2019-08-19 16:19:25 -03:00
Jaime Passos
21f2553a98 hghdfhdjhdhkdlfh 2019-08-19 15:34:12 -03:00
Jaime Passos
1ef58da49b slight cleanup 2019-08-19 15:27:20 -03:00