Commit graph

7301 commits

Author SHA1 Message Date
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
b14602bad9 Flatb 2019-10-21 12:42:04 -07:00
lachwright
3e584e5ad9 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00
lachwright
53835bcb1a Add new ATZ gargoyle sprites 2019-10-21 13:43:02 +08:00
lachwright
8c1c5be6f6 Only allow landing in the melee ability mid-twinspin if jump or spin is held 2019-10-21 12:49:12 +08:00
toaster
0f3101ce40 Modify initial platform sink to be more natural, while still toeing the line between "forgiving" and "punishing". 2019-10-20 19:13:46 +01:00
lachwright
f1cda61a63 Merge branch 'master' into linedef-153 2019-10-20 20:20:41 +08:00
MascaraSnake
fe2a333220 Merge branch 'platterwrap' into 'master'
Prevent wraparound on Level platter when there are less than 3 rows

See merge request STJr/SRB2Internal!383
2019-10-20 06:45:05 -04:00
MascaraSnake
aee4189d4d Merge branch 'kartport_dedi' into 'master'
Kart-port dedicated server Lua fix (round 2)

See merge request STJr/SRB2Internal!387
2019-10-20 06:43:54 -04:00
MascaraSnake
dc08c96dc0 Merge branch 'flats-fixes-13102019' into 'master'
Transparent flat fixes (Resolves #249)

Closes #249

See merge request STJr/SRB2Internal!384
2019-10-20 06:42:17 -04:00
MascaraSnake
8914e70dff Merge branch 'mapthingtweaks' into 'master'
Mapthing tweaks (object_tweaks division 1)

See merge request STJr/SRB2Internal!396
2019-10-20 06:33:01 -04:00
MascaraSnake
d647e0e4a1 Clarified description of "strong" bustable blocks in the ZB config 2019-10-20 12:28:30 +02:00
Steel Titanium
4e2e2a0a61 Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
MascaraSnake
7129293121 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
Monster Iestyn
0b1a264365 Merge branch 'fix-player-state-resynch' into 'master'
Fix player state resynching

See merge request STJr/SRB2Internal!393
2019-10-19 16:15:19 -04:00
MascaraSnake
75eec0b5da Merge branch 'thinkerlists_oops' into 'master'
Fixed a netgame crash that was caused by a closing brace being in the wrong place :v

See merge request STJr/SRB2Internal!395
2019-10-19 13:34:28 -04:00
Louis-Antoine
209a883821 Set the player's name as soon as they enter the game 2019-10-19 17:09:18 +02:00
toaster
73b662c575 Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2) 2019-10-19 16:01:04 +01:00
toaster
47054bd461 Grouped ports from object_tweaks.
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
2019-10-19 15:57:01 +01:00
MascaraSnake
5ad9779a38 Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real 2019-10-19 14:51:24 +02:00
MascaraSnake
c1dcefcc9a Fixed a netgame crash that was caused by a closing brace being in the wrong place :v 2019-10-19 12:08:15 +02:00
Monster Iestyn
cf75d45555 Fix missing & which I totally forgot about in writing this fix (yes this is the "compile error" everyone was talking about) 2019-10-18 13:37:42 +01:00
Monster Iestyn
7d5ebaf892 Fix sprite-related console errors that occur in netgames whenever the game attempts to synch the player's state.
Turns out the code was using P_SetMobjStateNF to "fix" the player's state ...which got things all wrong, lol.
2019-10-17 18:22:06 +01:00
Monster Iestyn
1078c59cdd Merge branch 'master' into mi-tinkers-with-lua-again 2019-10-17 18:02:42 +01:00
LJ Sonic
c3fb7f4332 Merge branch 'resynch-fix' into 'master'
Fix clients being resynched at the wrong gametic

See merge request STJr/SRB2Internal!391
2019-10-16 19:42:20 -04:00
sphere
232a558f2e Fix standalone hangable chains being broken, thanks to toaster. 2019-10-17 01:01:40 +02:00
sphere
46567ab147 Undo grabbable chains being placeable for now, since they're bugged. 2019-10-16 22:31:57 +02:00
sphere
71d7e2fedb Correct some ZB config errors & remove grabbable chains. 2019-10-16 22:30:52 +02:00
Louis-Antoine
656f88ad56 Fix clients being resynched at the wrong gametic 2019-10-16 21:24:30 +02:00
sphere
5778803012 Add normally placeable maces to the ZB config. 2019-10-16 21:20:49 +02:00
sphere
57a82e1a79 Make the maces and related objects normally placeable. 2019-10-16 21:12:04 +02:00
toaster
ec20d04e6f Compile fix. 2019-10-16 17:39:38 +01:00
toaster
036c6aa829 Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew? 2019-10-16 17:38:38 +01:00
toaster
3e3ee8717f Merge retry and respawn into one command, respawn. 2019-10-16 11:38:09 +01:00
toaster
effb506120 Make use of MINVAL and MAXVAL consistent in COM_Help_f. 2019-10-15 13:46:45 +01:00
toaster
69d43435f5 Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
toaster
61a242cc95 * Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue.
* Optimise M_ChangeCvar.
2019-10-15 12:24:31 +01:00
toaster
021f493664 Quick macro substitution to make sure MAXSCORE is consistent. 2019-10-15 11:55:40 +01:00
toaster
8bab035279 Added some examples of cvars that can use named values.
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
2019-10-15 11:49:37 +01:00
toaster
b5063ab8f6 Rework min/max cvars to allow for "named" values outside their range!
Kart-port round 3, with the original commit written by me, toaster.
2019-10-15 11:23:59 +01:00
toaster
69197211d6 Fix dedicated server extra lua variables not being synched for joiners.
Original fix written by Lat`.
2019-10-15 10:49:14 +01:00
Steel Titanium
3c71434a02 Allow access to players userdata outside levels.
In exchange for preventing access to any mobj_t userdata outside levels, including player's own mobj_t.
2019-10-14 22:12:26 -04:00
Steel Titanium
338c147526 Change this for consistency. 2019-10-14 21:47:20 -04:00
Steel Titanium
727b5e460b Update these files that I forgot to update.
Better than not updating it at all and having a inconsistency between versions reported from the header and internal lib version.
2019-10-14 20:41:37 -04:00
James R
0e51566d02 Collide with walls of FOF if both planes are intangible 2019-10-14 13:22:33 -07:00