Commit graph

7422 commits

Author SHA1 Message Date
James R
25d8b7d5ea Don't fade to Server Options 2019-10-19 12:25:02 -07:00
Steel Titanium
3e0a9cf742
Revert my old attempt of making the level music fade out before game over jingle 2019-10-19 14:36:30 -04:00
MascaraSnake
3f42834a98 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
c8629c2aab Adjust hardcoded skin numbers for character-related events, to fit with the re-ordered skins. 2019-10-19 18:16:52 +01:00
toaster
bf761a26d6 * 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
88d239ac36 Set the player's name as soon as they enter the game 2019-10-19 17:09:18 +02:00
toaster
7e04cbbc16 Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2) 2019-10-19 16:01:04 +01:00
toaster
920736ac8b 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
dfd6c5b9d2 Fix hw_light.c list (not gonna make an exe for this) 2019-10-19 15:50:16 +01:00
toaster
e549de392f Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters. 2019-10-19 14:46:14 +01:00
toaster
7f26b90113 Decrease drag on directionchar in waterslides on sphere's request. 2019-10-19 14:32:34 +01:00
toaster
f2bbf53c0d Change boost panel thing numbers per MS's request. 2019-10-19 14:32:15 +01:00
MascaraSnake
73c39990f9 Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real 2019-10-19 14:51:24 +02:00
MascaraSnake
c7fd22f98a 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
8e9ada1093 * Add MT_BANPYURA and MT_BANPSPRING to dehacked.c.
* Correct spelling of `MT_BANPSPRING`.
2019-10-18 20:32:35 +01:00
toaster
ad09f2603d * 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
246a6489e9 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
07c02f075b 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
c097ee563d Merge branch 'master' into mi-tinkers-with-lua-again 2019-10-17 18:02:42 +01:00
LJ Sonic
bb9a0de4f5 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
26fed77671 Fix standalone hangable chains being broken, thanks to toaster. 2019-10-17 01:01:40 +02:00
Steel Titanium
28607a81b5
Kill off SPR2_NTAG 2019-10-16 18:25:20 -04:00
Steel Titanium
edea290b0f
Show "Press ESC to exit" string on NiGHTS Attack menu too 2019-10-16 18:00:54 -04:00
Steel Titanium
dc0a1899ec
Fix ifselectvalnextmapnobrace indentation 2019-10-16 17:49:21 -04:00
sphere
2cc129c5c0 Undo grabbable chains being placeable for now, since they're bugged. 2019-10-16 22:31:57 +02:00
sphere
124716b8dd Correct some ZB config errors & remove grabbable chains. 2019-10-16 22:30:52 +02:00
Louis-Antoine
92b92dd3eb Fix clients being resynched at the wrong gametic 2019-10-16 21:24:30 +02:00
sphere
b58b043a5e Add normally placeable maces to the ZB config. 2019-10-16 21:20:49 +02:00
sphere
42de16b904 Make the maces and related objects normally placeable. 2019-10-16 21:12:04 +02:00
toaster
e3e87d7655 Compile fix. 2019-10-16 17:39:38 +01:00
toaster
77160ae37b Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew? 2019-10-16 17:38:38 +01:00
toaster
45e5f70eb8 Merge retry and respawn into one command, respawn. 2019-10-16 11:38:09 +01:00
Steel Titanium
38d044e475
Seperate name tag sprite into SPR2_NTAG 2019-10-16 00:22:05 -04:00
Steel Titanium
58ef85d591
Make nametag SPR2 frame be the last frame of SPR_XTRA 2019-10-15 23:41:01 -04:00
Steel Titanium
9c33f160a6
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
360ae45994 Make use of MINVAL and MAXVAL consistent in COM_Help_f. 2019-10-15 13:46:45 +01:00
toaster
8f3e59b43d Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
toaster
aa9bc574da * 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
3185a66191 Quick macro substitution to make sure MAXSCORE is consistent. 2019-10-15 11:55:40 +01:00
toaster
910df54fb5 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
911fd9576b 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
079ef023c9 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
313b534911
More record attack stuff.
Show emblem requirements.

Committed because I need sleep...
2019-10-15 01:55:50 -04:00
Steel Titanium
37101f826e
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
597949f370
Change this for consistency. 2019-10-14 21:47:20 -04:00
Steel Titanium
cbcb113d8e
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
5007abee23 Collide with walls of FOF if both planes are intangible 2019-10-14 13:22:33 -07:00
MascaraSnake
526d4a5e4b Merge branch 'shatter_solid' into 'master'
Make shatter blocks solid to non-players

See merge request STJr/SRB2Internal!379
2019-10-14 15:06:29 -04:00
lachwright
9ef72c0862 Fix directionchar issue from faulty merge conflict resolution 2019-10-15 02:57:18 +08:00
lachwright
b48d8cf68b Merge branch 'master' into knuxstuff 2019-10-15 02:50:59 +08:00