Commit graph

7046 commits

Author SHA1 Message Date
MascaraSnake
c8cfe08144 Merge branch 'mi-tinkers-with-lua-again' into 'master'
MI tinkers with lua again

See merge request STJr/SRB2Internal!392
2019-10-25 15:27:55 -04:00
MascaraSnake
a6b3491922 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
13edddc735 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
e8b788918f 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
604198280e 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
bd51ac8a70 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
4469294972 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
lachwright
69692d6088 Don't fuck nojumpspin characters who are capable of rolling 2019-10-25 18:51:41 +08:00
lachwright
c970d7c100 Put player in jump state after spinning during a wall transfer 2019-10-25 18:48:40 +08:00
toaster
8de96771e2 Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors. 2019-10-24 21:14:51 +01:00
toaster
58d4fce2bc 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
f80453fd5b 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
930be3dad2 Fix CEZ3's first phase being cheated by Fang. 2019-10-24 19:33:03 +01:00
toaster
1305c1cde8 Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261) 2019-10-24 19:16:53 +01:00
toaster
625f02ba3e 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
d079625b52 * 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
465f9055aa The console sucks, so "Don't" becomes "No" :lancer: 2019-10-23 17:37:09 -07:00
James R
98308c5485 Menu options 2019-10-23 17:31:10 -07:00
James R
cd1ad44539 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
57d6baac56 Revert sound and music window focus related toggles
This partially reverts commit 96a12b6bed.
2019-10-23 15:24:34 -07:00
Steel Titanium
5dd1b52024 Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
MascaraSnake
230f5e4d78 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
21a0ea4d0e Merge branch 'atz-hazards' into 'master'
Azure Temple Hazards

See merge request STJr/SRB2Internal!404
2019-10-23 02:51:00 -04:00
lachwright
ab0bb76705 Put dashmode players in pain state when damaging enemy with >1HP 2019-10-23 13:54:15 +08:00
lachwright
253775fc96 Fix compile warnings 2019-10-23 13:46:30 +08:00
lachwright
a1633e9acf Allow machine skins to damage objects in dashmode 2019-10-23 13:41:32 +08:00
James R
32d450fbe7 Apply HUD translucency to ping and FPS counters 2019-10-22 21:54:09 -07:00
James R
30c5b66d64 Toggle ping and FPS counters with HUD 2019-10-22 21:50:51 -07:00
James R
ac36d13420 Use long double suffix 2019-10-22 21:48:15 -07:00
james
24f0a95d59 Use less confusing player sorting key names 2019-10-22 21:41:34 -07:00
james
cb5610a86e Do not start sound system when disabled 2019-10-22 21:39:37 -07:00
lachwright
7f55ee6fd9 Add Metal's jet fume 2019-10-23 12:35:17 +08:00
James R
bc636fbcca Move change viewpoint control checking so it doesn't take precedence
Notably over chat.
2019-10-22 21:32:12 -07:00
James R
96a12b6bed 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
a157fe9ac0 Make "Focus lost" HUD overlay optional 2019-10-22 20:30:05 -07:00
James R
a763273736 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-10-22 20:14:01 -07:00
James R
35810f9535 Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-10-22 20:09:33 -07:00
James R
84aea5ef5b Support adding to CV_FLOAT cvars with the Add command 2019-10-22 20:04:02 -07:00
James R
be4ac1eef4 Add a command to increment cvars 2019-10-22 20:03:45 -07:00
James R
3970085d5d Grab mouse on window focus
Window focus does not necessarily imply mouse movement.
2019-10-22 19:45:43 -07:00
James R
8f48c7f21d Replace ping command with a condensed and sorted version 2019-10-22 19:40:05 -07:00
James R
4f5d32a73f "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
James R
7f1a276a6c Clang warnings 2019-10-22 19:18:56 -07:00
toaster
d3f59f5cd1 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
81d4bf8cd9 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
Nev3r
21353ae0bd 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
20af876282 Disable standalone hangable chains, since they're not a good mechanic. 2019-10-22 02:29:34 +02:00
James R
1a393dcfc3 lmao I forgot the backside FOF 2019-10-21 14:44:16 -07:00
James R
6b22b6e450 Comment for insanity 2019-10-21 14:28:22 -07:00
James R
d4b778884b Fix hang due to comparison not working on at least GCC 9.1
I have no idea what the fuck is going on here. k infinitely ascends. (Even
above integer restrictions when I made it UINT8.) I can only imagine some kind
of fuckery in the stack. Surely this is a compiler error.
2019-10-21 14:20:29 -07:00