lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,956 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

5956 Commits

Author SHA1 Message Date
MascaraSnake 018fb9b461 "Finished" minecart hardcoding (still untested and buggy) 2019-06-14 21:19:52 +02:00
MascaraSnake db66f58f2b Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-13 21:52:08 +02:00
MascaraSnake 43f28b8f56 Set tracers via P_SetTarget and not directly 2019-06-13 21:51:31 +02:00
MascaraSnake ba9c7d9310 More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake 1ff64baf8b Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-12 21:28:39 +02:00
MascaraSnake fae4dc3f21 Forgot to hardcode the mobj.valid checks 2019-06-12 21:28:09 +02:00
MascaraSnake fafabaae2b Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
MascaraSnake 6a46fc76b8 Fixed some angle business in the BASH code 2019-06-10 20:40:12 +02:00
MascaraSnake 068e07974d Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
MascaraSnake 0e80d2ec5d Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
MascaraSnake 85eece29d3 Fixed the bug 2019-06-10 16:19:58 +02:00
MascaraSnake b98de5d362 Hardcoded the new BASH behavior (there's still a bug lurking somewhere) 2019-06-10 16:09:15 +02:00
MascaraSnake 4d0b0f84b1 Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again. 2019-06-10 14:10:37 +02:00
MascaraSnake 98ea229680 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
MascaraSnake 3a16a7d7d4 Hardcoded train dust and steam spawner 2019-06-09 17:16:07 +02:00
MascaraSnake 6df14492a5 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake ca4ab06abf Hardcoded wood debris 2019-06-09 12:27:09 +02:00
MascaraSnake 7b603f4ac8 Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch) 2019-06-09 10:51:33 +02:00
MascaraSnake 546af19c82 Hardcoded oil lamp 2019-06-08 15:50:01 +02:00
MascaraSnake 3d65ec7426 Changed cacti widths 2019-06-08 14:45:01 +02:00
MascaraSnake 5ac594abf5 Fixed dust scaling, changed sound captions 2019-06-08 14:12:39 +02:00
MascaraSnake 1aaccfcd5c Hardcoded dust devil 2019-06-08 09:51:46 +02:00
Monster Iestyn 68585dbc70 Merge branch 'checksight-fixes' into 'master' 
P_CheckSight fixes

See merge request STJr/SRB2Internal!223
 2019-06-02 13:13:48 -04:00
Monster Iestyn b7f75246e4 Merge branch 'master' into checksight-fixes 
# Conflicts:
#	src/p_sight.c
 2019-06-02 18:13:02 +01:00
Monster Iestyn 9e6fd595da Merge branch 'acz-boss-hardcode' into 'master' 
ACZ boss hardcode

See merge request STJr/SRB2Internal!221
 2019-06-02 13:09:38 -04:00
Monster Iestyn 571c5b89b5 Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking. 2019-05-27 21:18:02 +01:00
Monster Iestyn abfdac15a8 Fixed P_CheckSight to support slopes, both for normal planes and FOF planes 
(Untested)
 2019-05-27 20:36:35 +01:00
Monster Iestyn ad4006712e fix P_CheckSight to consider FOFs that completely block the view 
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
 2019-05-27 19:32:05 +01:00
Monster Iestyn 677801f5ff Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both 2019-05-23 21:51:58 +01:00
Monster Iestyn e60b0b1a80 Update hw_light.c 
(though I'm not sure why we bother, since coronas have been disabled for a decade now)
 2019-05-23 21:08:27 +01:00
Monster Iestyn 7d0509f1cb Merge branch 'master' into acz-boss-hardcode 2019-05-23 20:38:25 +01:00
Monster Iestyn 742b11c0ff Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there! 
The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.
 2019-05-21 21:51:19 +01:00
Monster Iestyn ec0719f74f Merge branch 'steelt-acz-things-hardcode' into 'master' 
Hardcode some ACZ things

See merge request STJr/SRB2Internal!220
 2019-05-17 12:22:21 -04:00
Monster Iestyn 572328a4fa Merge branch 'public_flatsprite' 2019-05-16 16:00:24 +01:00
Monster Iestyn 66bc287688 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn 600a373739 Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Monster Iestyn 2a9019c15e Merge branch 'archiveworld-sigsegv-fix' into 'next' 
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.

See merge request STJr/SRB2!490
 2019-05-13 07:02:48 -04:00
Alam Ed Arias addf2bb3c4 Fix NONET build 2019-05-13 01:51:36 -04:00
Steel Titanium 8a14427420 Merge branch 'perpetual-modifier-updates' into 'master' 
Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456
 2019-05-13 00:36:06 -04:00
Steel Titanium 06961a8f5e Merge branch 'no-frameskip' into 'next' 
Don't skip frames when connecting or paused

See merge request STJr/SRB2!489
 2019-05-13 00:35:11 -04:00
Steel Titanium cad65ad5e9 Properly fix crash due to duplicated lines. 2019-05-13 00:23:43 -04:00
Steel Titanium 4e0cc2505a Revert "Check that lumps are okay" 
This reverts commit 7ac0a8b4d2.
 2019-05-13 00:20:39 -04:00
Steel Titanium b34aa86403 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
James R 7ac0a8b4d2 Check that lumps are okay 2019-05-08 20:30:19 -04:00
Monster Iestyn f0e16cad32 Merge branch 'master' into next 2019-05-08 16:31:05 +01:00
Monster Iestyn 8ea9d0e95c Merge branch 'alias_recursion_hotfix_2' into 'master' 
Alias recursion hotfix 2

See merge request STJr/SRB2!482
 2019-05-08 11:25:15 -04:00
wolfy852 8f05d75926 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05:00
wolfs e394f41c52 Merge branch 'public-musicplus-tagfix' into 'next' 
Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486
 2019-05-07 22:42:13 -04:00
Monster Iestyn 360a6ff89a Merge branch 'public_flatsprite' into 'public_flatsprite' 
Merge in next and don't billboard papersprites in GL

See merge request STJr/SRB2!488
 2019-05-06 15:34:35 -04:00
Sryder b304b268c8 No sprite billboarding on papersprites 2019-05-06 20:24:26 +01:00