Commit graph

9874 commits

Author SHA1 Message Date
toaster
6a9da63d7f 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
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
MascaraSnake
8ddcced6f0 Pyre Fly: Don't spawn smoke and flames if no player is in range 2019-08-30 09:05:49 +02:00
MascaraSnake
4cece9fe36 Pyre Fly: Don't run the fuse code when dead 2019-08-30 08:55:29 +02:00
MascaraSnake
806b106905 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
Steel Titanium
8167a88bec
Rename private mode to unlisted mode 2019-08-30 00:38:58 -04:00
Steel Titanium
5c295d285b
Capitalize the 'if' 2019-08-30 00:36:10 -04:00
Steel Titanium
10ea0f21ae
Fix spawning within random range 2019-08-29 23:56:15 -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
James
bcd0b04488 Forgot to account for z axis -- thanks James R 2019-08-29 17:17:58 -04:00
James
656879b90b Is this thing working? 2019-08-29 15:56:46 -04:00
Steel Titanium
8655b8f1f1
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
1040a93a6e
Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
Steel Titanium
7ccff2e6e3
Merge branch 'master' into mprelated-tweaks 2019-08-28 22:26:52 -04:00
Steel Titanium
7e47117afa
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
121d8b7838 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
b4d8126675
Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
MascaraSnake
2933ec3e9c 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
a98862b3ed
Allow letters to be used on ipv4 address field 2019-08-26 22:00:07 -04:00
Steel Titanium
b2712af2d0
Reorder the main multiplayer menu 2019-08-26 21:49:12 -04:00
Steel Titanium
1416312200
Move some cvars out of D_ClientServerInit and save them
Ported over from Kart
2019-08-26 20:38:32 -04:00
Jaime Passos
015216b9ac Don't draw borders or patches if not necessary. 2019-08-26 20:49:04 -03:00
James R
89c4989987 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Jaime Passos
93f1450b8a Merge remote-tracking branch 'origin/master' into newmenus 2019-08-26 19:32:44 -03: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
MascaraSnake
671da01607 Only spawn lavafall rocks if a player is nearby 2019-08-25 23:43:07 +02:00
MascaraSnake
7ca67a8688 Added reverse gravity support to lavafalls 2019-08-25 23:31:12 +02: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
MascaraSnake
50e51c137e Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake
57d28c7814 Rejig the thing type numbers 2019-08-25 20:01:08 +02:00
Monster Iestyn
d1105abdb3 Merge branch 'public_next'
# Conflicts:
#	src/d_netfil.c
2019-08-25 18:18:59 +01:00
MascaraSnake
2a5c576c1c Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02:00
Steel Titanium
13d627ee7f Remove extra whitespace 2019-08-24 18:29:56 -04:00
Monster Iestyn
964693d542 Merge branch 'master' into next 2019-08-24 23:28:38 +01:00
Steel Titanium
08808e2200 I don't even know how this happened 2019-08-24 18:27:07 -04:00
Steel Titanium
9f7613ef6d Typecast p to INT16
Since the enum type is implementation-defined, and could be either signed or unsigned.
2019-08-24 18:22:18 -04:00
toaster
b746ef66ac Fix range print for getter error (setter was caught ahead of time) 2019-08-24 22:56:20 +01:00
Steel Titanium
fbec4af086
Fallback graphic for firework display, if the character lacks one. 2019-08-24 17:17:55 -04: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
MascaraSnake
dbbb805e92 Green Snapper: Update Z position of legs during movement 2019-08-24 20:23:28 +02:00
toaster
4e256b73b2 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
9809e15033 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
e5071bb605 Compare the file name only for real
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
Steel Titanium
53892a9eb1
Work on new title card
Even though it's not complete there's an issue where it would stop breifly during a fade.
2019-08-23 00:21:12 -04:00
toaster
1f2baf5b6b 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
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
GoldenTails
74de804817 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem 2019-08-22 06:27:00 -05:00