6b151ef4ea
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-02 23:36:15 -03:00
fe99c64511
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
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
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
8167a88bec
Rename private mode to unlisted mode
2019-08-30 00:38:58 -04:00
5c295d285b
Capitalize the 'if'
2019-08-30 00:36:10 -04:00
10ea0f21ae
Fix spawning within random range
2019-08-29 23:56:15 -04:00
028996915d
Merge branch 'master' into next
2019-08-29 19:28:02 -04:00
dadec1196b
Warn on implicit fallthrough
2019-08-29 19:27:52 -04:00
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
1040a93a6e
Ignore bots when looking for a player
2019-08-28 23:12:25 -04:00
7ccff2e6e3
Merge branch 'master' into mprelated-tweaks
2019-08-28 22:26:52 -04:00
7e47117afa
Add warning message when attempting to use the master server browser while `modifiedgame` is true.
2019-08-28 20:24:30 -04:00
121d8b7838
Merge branch 'abpolish' into 'master'
...
Autobrake polish
Closes #176
See merge request STJr/SRB2Internal!293
2019-08-28 00:34:21 -04:00
b4d8126675
Rename offline mode to private mode
2019-08-27 18:05:30 -04:00
a98862b3ed
Allow letters to be used on ipv4 address field
2019-08-26 22:00:07 -04:00
b2712af2d0
Reorder the main multiplayer menu
2019-08-26 21:49:12 -04:00
1416312200
Move some cvars out of D_ClientServerInit and save them
...
Ported over from Kart
2019-08-26 20:38:32 -04:00
89c4989987
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07:00
ab90526541
Merge branch 'candamagefix' into 'master'
...
P_PlayerCanDamage fix
See merge request STJr/SRB2Internal!291
2019-08-26 11:32:10 -04:00
db3a2e02a5
Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively
2019-08-25 22:24:08 +01:00
d1105abdb3
Merge branch 'public_next'
...
# Conflicts:
# src/d_netfil.c
2019-08-25 18:18:59 +01:00
964693d542
Merge branch 'master' into next
2019-08-24 23:28:38 +01:00
fbec4af086
Fallback graphic for firework display, if the character lacks one.
2019-08-24 17:17:55 -04:00
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
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
e5071bb605
Compare the file name only for real
...
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
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
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
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
41d5ffa17f
Fix OpenGL renderer crash with -skipintro command line parameter.
2019-08-20 20:21:53 -03:00
6ef9ee5467
true not TRUE
2019-08-20 15:43:59 -04:00
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
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
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
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
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
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
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
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
9c1fa867fa
Include md5.h
2019-08-17 10:34:19 -07:00
c1ba72ead8
Remove a printf
2019-08-17 10:33:33 -07:00
19dd9a3c14
Kart discrepancies
2019-08-17 10:33:14 -07:00
0949406b9c
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
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
e52a314ddb
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
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
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
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
5c2786b163
Make the various carry types' handling code into a switch case
2019-08-15 18:02:30 +01:00
Jaime Passos