Commit graph

4133 commits

Author SHA1 Message Date
toasterbabe
021e7ed1f0 Okay, actually fixed. Thanks, MI, for understanding the maths a little better than I :p 2017-07-30 17:45:27 +01:00
toasterbabe
1e1d191a75 Make it so you can't even STAND on spikes if you're flashing and moving away from them. 2017-07-30 16:52:39 +01:00
TehRealSalt
0b05b10bdb Merge remote-tracking branch 'refs/remotes/origin/master' into save-mode 2017-07-30 11:13:52 -04:00
toasterbabe
1180f0418e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 2017-07-26 17:52:34 +01:00
toasterbabe
be5184a8cc ...fixed some weirdness with spinning I accidentially introduced in an attempt to fix it. 2017-07-26 16:34:33 +01:00
toasterbabe
672bcc349c * Hide the number of lives you can steal if game-overed. It's not directly relevant unless you're game overed.
* Fix an issue where everyone being game overed except for one person, and then kicking that one person, meant the game over trigger was never met.
* Fix an issue where the spectator text could be overridden with a count of the number of remaining players to complete the level.
* Fixed a few glitches with spinning. (Unrelated to the branch, but exposed through new_coop testing.)
2017-07-26 16:10:08 +01:00
toasterbabe
2bdf432703 Allow for the previous defaulting system to continue working. 2017-07-26 13:50:49 +01:00
Monster Iestyn
07c260a83e Merge branch 'master' into opengl-improvements 2017-07-25 19:11:16 +01:00
Monster Iestyn
15bd6b980d Merge branch 'master' into lua-action-userdata 2017-07-25 19:10:56 +01:00
Monster Iestyn
025891d2aa Merge branch 'master' into gametype-strings 2017-07-25 19:10:38 +01:00
toasterbabe
3186d6a4e4 * An improved Multiplayer menu.
* If NONET, the Multiplayer option on the main menu leads directly to the Splitscreen menu, which also includes player 1/2 setup under this circumstance.
* A mechanism to save player name, skin and colour as defaults to config.cfg.
2017-07-25 18:34:13 +01:00
Monster Iestyn
3948ab6da5 Merge branch 'master' into lua-lump-load-only 2017-07-25 17:18:07 +01:00
Monster Iestyn
472d962e1a Merge branch 'master' into lua-spritedefs 2017-07-25 17:17:48 +01:00
Monster Iestyn
cfbe180312 Merge branch 'public_next' 2017-07-25 17:17:22 +01:00
Monster Iestyn
55e0e71d92 Merge branch 'next' into public_next 2017-07-25 17:17:01 +01:00
Monster Iestyn
bba78a95b5 Merge branch 'charability-trigger-hotfix' into 'next'
Charability trigger hotfix

Apparently when I made `P_RunTriggerSpecial` less than 3 years ago (August 2014) and cleaned up the trigger linedef code, I accidentally inverted the ability check for linedef types 305-307 by mistake, thereby causing the linedefs to activate for anyone EXCEPT those with the ability instead. Whoops.

See merge request !205
2017-07-25 11:07:03 -04:00
Monster Iestyn
821692fbf7 This was my fault, whoops 2017-07-24 17:53:18 +01:00
toasterbabe
634c560e99 * Who wore it better? https://cdn.discordapp.com/attachments/293238104096112641/338696939774279680/srb20037.png
* Now that Cyan is back, swap out the substitute Teal in the emblems for it.
* P_GetMobjSprite2 is now P_GetSkinSprite2.
* Correct "Siler".
2017-07-23 17:49:19 +01:00
toasterbabe
8941379c64 Implementation of all the new skincolours. No new exe yet, though, since I'm still doin' stuff. 2017-07-22 23:24:12 +01:00
toasterbabe
b2e92e7a09 * Invert solidity flag for vertical spikes and wallspikes.
* (unrelated) Per a request by sphere, make the ambush flag stop sounds being made by the gas jet.
2017-07-19 17:07:31 +01:00
toasterbabe
ef4dc42c7c * Bustable wallspikes.
* Improve the code for busting vertical spikes.
* Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta)
* Make all spikes consistently do damage with DMG_SPIKE.
* (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-19 16:26:49 +01:00
Monster Iestyn
2456ae8260 Merge branch 'p_isobjectongroundin-fixes' into 'next'
Fixes for Each Time and P_IsObjectOnGroundIn

Fixes the issue with Each Time reported here: https://mb.srb2.org/showthread.php?t=42818

Also fixes a separate issue with P_IsObjectOnGroundIn and intangible FOFs (where it determined that standing at the top height of them counted as being on the ground) which was also reproducable via the above bug funnily enough.

See merge request !204
2017-07-18 22:51:29 -04:00
toasterbabe
2330f1a9c9 Account for the fact that pointtoangle2 points due weast if there's no dy OR dx, so that's taken care of. 2017-07-18 17:04:30 +01:00
toasterbabe
d1be22ccf5 * Scope tweakin's to prevent having to make some stuff static.
* Make wallspikes intangible if you're being thrust away from them in pain.
2017-07-18 17:01:19 +01:00
toasterbabe
a5477737d7 Whooh boy. Probably requires re-review.
* Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove.
* Knockback for wallspikes is much more consistent.
* Optimised away a FixedDiv call when determining the slopetype of a line.
* Changed the position of the wallspike base slightly.
* Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 14:17:23 +01:00
toasterbabe
6d43fad098 Correct the baseradius stuff. (Still doing some other work, though - will let you know when the branch is safe to review.) 2017-07-18 12:56:39 +01:00
toasterbabe
66d59efddc Sorry, MI. More info in forthcoming merge request. 2017-07-17 23:58:54 +01:00
toasterbabe
6250266af5 Preparatory work for the contestesque implementation. 2017-07-17 23:26:24 +01:00
Monster Iestyn
4d740ff783 Change getSpritePatch and getSpritePatch to accept angles 1-8 instead of 0-7, and just decrement the numbers internally
0 now just defaults to front angle (1, or 0 internally), in case people thought it was a separate angle from 1-8 for some reason
2017-07-17 21:31:33 +01:00
Monster Iestyn
6e5cffba5b Create static function P_IsObjectOnRealGround for each time thinker to use in place of P_IsObjectOnGroundIn, for non-FOF floor touch specials
This fixes solid FOFs activating floor touch specials for normal ground if using an "each time" trigger linedef
2017-07-17 20:56:55 +01:00
Monster Iestyn
7d4513f2f1 Don't be stupid with FF_BLOCKPLAYER/FF_BLOCKOTHERS flags please 2017-07-17 20:47:00 +01:00
toasterbabe
9b506b2fde I legitimately cannot remember for the life of me why I added this check. It broke spectator text in gametypes outside of co-op, so... 2017-07-17 18:16:41 +01:00
toasterbabe
9bd10fb0d2 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 2017-07-17 16:44:10 +01:00
Monster Iestyn
e32774a604 Merge branch 'master' into lua-spritedefs 2017-07-16 22:19:54 +01:00
Monster Iestyn
832a7b1f5a Merge branch 'master' into opengl-improvements 2017-07-16 21:39:45 +01:00
Monster Iestyn
0416981c1b Merge branch 'mi-hardcode-again' into 'master'
MI hardcode again

Stuff hardcoded in this branch:
* Everything from SOC_TREE in patch.dta - the GFZ trees use thing types 806-808 and the other trees 810-816
* Everything from SOC_TOKE in patch.dta (but done better)
* Wall spikes, from Nev3r's DSZ/ACZ work, edited to actually hurt you on touch - these use thing type 522

MonsterIestyn/mi-hardcode-again on the FTP includes a test exe (srb2win-mihardcodeagain.exe) and a modified patch.dta (where SOC_TREE and SOC_TOKE are removed and missing wall spike sprites added). A test map for tokens in mario blocks is also included (marioblocktoken.wad).

See merge request !106
2017-07-16 16:37:53 -04:00
toasterbabe
4728c824a0 Comment correction. 2017-07-16 01:01:13 +01:00
toasterbabe
d5365a26e1 ...and revert brak, too 2017-07-15 22:42:39 +01:00
toasterbabe
f04c5292c7 Revert pointless change to A_RandomState. 2017-07-15 22:38:43 +01:00
Monster Iestyn
64fae001eb Update hw_light.c's sprite lights list with the updates to the sprites list (and any before that I missed)
Not that we're using coronas at all anymore so whatever
2017-07-15 21:16:45 +01:00
Monster Iestyn
dbc7a4099f Hardcoded SOC_TOKE from patch.dta
Or rather, I killed anything to do with the old background orb, renamed all "EMMY" stuff to "TOKEN", and of course adjusted the new S_TOKEN accordingly
2017-07-15 20:15:34 +01:00
Monster Iestyn
381138d7b1 Increased hitbox height of GFZ trees to 128 FU and gave them all MF_SCENERY 2017-07-15 16:57:03 +01:00
toasterbabe
826fad4c78 More caption change. 2017-07-14 23:32:27 +01:00
Monster Iestyn
00062220de Move spawning of base to P_SpawnMapThing, so objectplacing a wall spike doesn't look weird
Also attempted to "optimise" spawning and position correction code
2017-07-14 17:19:01 +01:00
Monster Iestyn
444e9ce7df Fix wall spikes being harmful from below, set initial destscale of base too just in case 2017-07-14 17:01:13 +01:00
Monster Iestyn
eacf753f2c Add the remaining code from the Lua script to get wall spikes actually working so far 2017-07-13 23:00:45 +01:00
Monster Iestyn
aa947ea022 Starting work for hardcoding wall spikes 2017-07-13 22:42:08 +01:00
Monster Iestyn
96ec319897 Hardcoded SOC_TREE from patch.dta
Also made sure the GFZ trees have MF2_STANDONME
2017-07-13 17:29:15 +01:00
toasterbabe
fe756d567e Add a "bias" to collision with chain ferris wheels to make it more likely that you'll grab one nearer to the center if you could potentially hit two in the next frame (previously was blockmap order dependent, which was never consistent) 2017-07-12 14:43:59 +01:00
toasterbabe
b568816217 * Modified A_RandomState. If var2 is supplied, it picks between var1, var2 and nextstate - otherwise, it picks between var1 and nextstate.
* Changed a caption.
2017-07-11 12:55:24 +01:00