Commit graph

8424 commits

Author SHA1 Message Date
MascaraSnake
d7480f20fa Merge branch 'intangible-flats-tangible-sides' into 'master'
Collide with walls of FOF if both planes are intangible

See merge request STJr/SRB2Internal!385
2019-10-25 15:26:54 -04:00
MascaraSnake
080ff854b8 Merge branch 'be-more-nice-with-levelselect-mp' into 'master'
Remove level select restrictions in DEVELOP Multiplayer

Closes #238

See merge request STJr/SRB2Internal!399
2019-10-25 15:26:09 -04:00
MascaraSnake
829706a090 Merge branch 'walltransfermove' into 'master'
Let players move after spinning off a wall transfer

See merge request STJr/SRB2Internal!412
2019-10-25 15:20:20 -04:00
MascaraSnake
5a28c03a26 Merge branch 'superminecarts' into 'master'
Super and Minecarts fixes (resolves #259)

Closes #259

See merge request STJr/SRB2Internal!408
2019-10-25 15:19:47 -04:00
MascaraSnake
2ee42c498b Merge branch 'nonightsbot' into 'master'
Disable tailsbot in NiGHTS maps (resolves #261)

Closes #261

See merge request STJr/SRB2Internal!409
2019-10-25 15:19:05 -04:00
MascaraSnake
7a09a8bd3a Merge branch 'cezfangcheat' into 'master'
CEZ3 Fang cheat fix (resolves #262)

Closes #262

See merge request STJr/SRB2Internal!410
2019-10-25 15:18:16 -04:00
MascaraSnake
6c60a67a4f Merge branch 'waterlighting' into 'master'
Water lighting reversion (resolves #188 for now)

Closes #188

See merge request STJr/SRB2Internal!411
2019-10-25 15:17:35 -04:00
MascaraSnake
53ac815334 ...and also rename the palm tree leaves accordingly 2019-10-25 20:48:51 +02:00
MascaraSnake
863101824a Removed palm tree trunks from the ZB config. They no longer exist as mapthings. 2019-10-25 20:17:50 +02:00
lachwright
2d458059c8 Don't fuck nojumpspin characters who are capable of rolling 2019-10-25 18:51:41 +08:00
lachwright
d5b1467e79 Put player in jump state after spinning during a wall transfer 2019-10-25 18:48:40 +08:00
toaster
630bdaa876 Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors. 2019-10-24 21:14:51 +01:00
toaster
d89d8acc59 I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour. 2019-10-24 20:40:03 +01:00
toaster
4ff46d14dd Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring). 2019-10-24 19:55:02 +01:00
toaster
ea0fe50f5a Fix CEZ3's first phase being cheated by Fang. 2019-10-24 19:33:03 +01:00
toaster
527254584d Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261) 2019-10-24 19:16:53 +01:00
toaster
989e089e0a resolve #263 (this is going into master because it's literally just the line being present twice) 2019-10-24 19:00:54 +01:00
toaster
a215eeabf0 * Fix Super players who die being eternally super.
* Fix music stack corruption in multiplayer where a super player dies and it's not you.
* Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch).

Resolves #259.
2019-10-24 18:51:12 +01:00
James R
c970911ac2 The console sucks, so "Don't" becomes "No" :lancer: 2019-10-23 17:37:09 -07:00
James R
48173beb35 Menu options 2019-10-23 17:31:10 -07:00
James R
cd252eb468 Console variables to toggle music/sound playing when the window is unfocused
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
2019-10-23 17:21:09 -07:00
James R
9162ba87cc Revert sound and music window focus related toggles
This partially reverts commit 5ac8a26814.
2019-10-23 15:24:34 -07:00
Steel Titanium
bfce75d5cd
Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
MascaraSnake
0ef50557c2 Merge branch 'spinbust' into 'master'
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
MascaraSnake
8cd0ebb679 Merge branch 'atz-hazards' into 'master'
Azure Temple Hazards

See merge request STJr/SRB2Internal!404
2019-10-23 02:51:00 -04:00
lachwright
06bbbb5cf8 Put dashmode players in pain state when damaging enemy with >1HP 2019-10-23 13:54:15 +08:00
lachwright
7be046e16c Fix compile warnings 2019-10-23 13:46:30 +08:00
lachwright
6d498fe357 Allow machine skins to damage objects in dashmode 2019-10-23 13:41:32 +08:00
James R
52c5d49215 Apply HUD translucency to ping and FPS counters 2019-10-22 21:54:09 -07:00
James R
d86be51472 Toggle ping and FPS counters with HUD 2019-10-22 21:50:51 -07:00
James R
0b314a82bb Use long double suffix 2019-10-22 21:48:15 -07:00
james
aa9f19512c Use less confusing player sorting key names 2019-10-22 21:41:34 -07:00
james
39baca89d3 Do not start sound system when disabled 2019-10-22 21:39:37 -07:00
lachwright
c201879d69 Add Metal's jet fume 2019-10-23 12:35:17 +08:00
James R
923f43f887 Move change viewpoint control checking so it doesn't take precedence
Notably over chat.
2019-10-22 21:32:12 -07:00
James R
5ac8a26814 Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
James R
12540dca32 Make "Focus lost" HUD overlay optional 2019-10-22 20:30:05 -07:00
James R
43ca2c1b30 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-10-22 20:14:01 -07:00
James R
a24814c2fc Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-10-22 20:09:33 -07:00
James R
f0ee901160 Support adding to CV_FLOAT cvars with the Add command 2019-10-22 20:04:02 -07:00
James R
135619af8b Add a command to increment cvars 2019-10-22 20:03:45 -07:00
James R
602c66d173 Grab mouse on window focus
Window focus does not necessarily imply mouse movement.
2019-10-22 19:45:43 -07:00
James R
3ffa84a77b Replace ping command with a condensed and sorted version 2019-10-22 19:40:05 -07:00
James R
29a5999a44 "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
James R
d62674c184 Clang warnings 2019-10-22 19:18:56 -07:00
toaster
386ac78600 Merge branch 'mace-place' into 'master'
Make maces normally placeable in maps.

See merge request STJr/SRB2Internal!390
2019-10-22 13:29:06 -04:00
Monster Iestyn
520deac658 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
Nev3r
dbd8e563b4 Merge branch 'soundex_tweak' into 'master'
Tweak Line Special 414's behavior

See merge request STJr/SRB2Internal!382
2019-10-22 05:31:22 -04:00
sphere
57a8af1557 Disable standalone hangable chains, since they're not a good mechanic. 2019-10-22 02:29:34 +02:00
James R
acd28c001e lmao I forgot the backside FOF 2019-10-21 14:44:16 -07:00