Commit graph

7426 commits

Author SHA1 Message Date
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
James R
25dc99a50b Fix item selection not returning to "Specify IPv4 Address" 2019-10-19 13:07:20 -07:00
James R
10c74c0d6a Fix "You must specify an IP address" message returning to title instead of MP menu 2019-10-19 13:01:06 -07:00
James R
3c2ccd7107 Don't fade to character select from secret level select 2019-10-19 12:42:53 -07:00
James R
85b453e5b9 Don't fade to Server Options 2019-10-19 12:25:02 -07:00
Steel Titanium
5527cb051f Revert my old attempt of making the level music fade out before game over jingle 2019-10-19 14:36:30 -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
toaster
043a9bb4fe Adjust hardcoded skin numbers for character-related events, to fit with the re-ordered skins. 2019-10-19 18:16:52 +01:00
toaster
869c2e0d1a * Implement fixes/tweaks as written on the gitlab.
* `SPR2_NTAG` last vestiges removal.
    * Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`.
    * Fixed nametag colour issues.
    * Support widescreen with nametags.

* Fix a metric SHITTON of compiler errors.
    * Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`)
    * GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`)
    * Redefining `lines` within the scope of the global.
    * Redefining `string` within the function-specific `string`.
    * It would be recommended for y'alls to turn ERRORMODE on!
2019-10-19 18:15:54 +01: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
toaster
8649b1e353 Fix hw_light.c list (not gonna make an exe for this) 2019-10-19 15:50:16 +01:00
toaster
00ba624cfa Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters. 2019-10-19 14:46:14 +01:00
toaster
a609fa0859 Decrease drag on directionchar in waterslides on sphere's request. 2019-10-19 14:32:34 +01:00
toaster
d5c8607cb1 Change boost panel thing numbers per MS's request. 2019-10-19 14:32:15 +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
toaster
766db2603d * Add MT_BANPYURA and MT_BANPSPRING to dehacked.c.
* Correct spelling of `MT_BANPSPRING`.
2019-10-18 20:32:35 +01:00
toaster
383b93e43a * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01: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
Steel Titanium
dcce4e3cea Kill off SPR2_NTAG 2019-10-16 18:25:20 -04:00
Steel Titanium
cb90f39a58 Show "Press ESC to exit" string on NiGHTS Attack menu too 2019-10-16 18:00:54 -04:00
Steel Titanium
2243a1eaa9 Fix ifselectvalnextmapnobrace indentation 2019-10-16 17:49:21 -04: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
Steel Titanium
cddad58a54 Seperate name tag sprite into SPR2_NTAG 2019-10-16 00:22:05 -04:00
Steel Titanium
1ca9c90361 Make nametag SPR2 frame be the last frame of SPR_XTRA 2019-10-15 23:41:01 -04:00
Steel Titanium
2137d5ec21 Lots of changes
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
2019-10-15 22:54:21 -04: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
676c81bfd1 More record attack stuff.
Show emblem requirements.

Committed because I need sleep...
2019-10-15 01:55:50 -04: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