lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
7310 commits 1 branch 29 tags 122 MiB
Commit graph

7310 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
James R 8c5c2a7e4b Flatb 2019-10-21 12:42:04 -07:00
lachwright 3a3122e255 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00
lachwright d6411b9549 Add new ATZ gargoyle sprites 2019-10-21 13:43:02 +08:00
lachwright c52ee364f5 Only allow landing in the melee ability mid-twinspin if jump or spin is held 2019-10-21 12:49:12 +08:00
toaster 9d425b21e2 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 a2f0f61d75 Merge branch 'master' into linedef-153 2019-10-20 20:20:41 +08:00
MascaraSnake 57d29a9b65 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 7c481744a4 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 41dd9c4f0a 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 fcf05c728b Merge branch 'master' into object_tweaks 2019-10-20 12:34:49 +02:00
MascaraSnake 54847b1949 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 0a321b96d3 Clarified description of "strong" bustable blocks in the ZB config 2019-10-20 12:28:30 +02:00
Steel Titanium b219be6f5e
Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
MascaraSnake 1604e4d439 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 9c36cf00d8 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 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
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
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
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