MascaraSnake
2edb852f2c
Merge branch 'pmomztweak' into 'master'
...
Fix pmomz (resolves #64!?)
Closes #64
See merge request STJr/SRB2Internal!447
2019-11-11 11:24:01 -05:00
MascaraSnake
c85f471911
Merge branch 'kill-these-please' into 'master'
...
Kill the new compiler errors (since GCC 9?)
See merge request STJr/SRB2Internal!448
2019-11-11 11:23:16 -05:00
MascaraSnake
afd461a860
Merge branch 'skin-wads-again' into 'master'
...
So I don't know what a skin wad is... (closes #282 )
Closes #282
See merge request STJr/SRB2Internal!449
2019-11-11 11:22:30 -05:00
MascaraSnake
7c7fc35ec5
Merge branch 'deathlaunch' into 'master'
...
Fix players being launched by slopes and pmomz when dying.
See merge request STJr/SRB2Internal!452
2019-11-11 11:22:12 -05:00
MascaraSnake
2e1e9b13d9
Merge branch 'magicalmovingfire' into 'master'
...
Magical moving fire
Closes #278
See merge request STJr/SRB2Internal!453
2019-11-11 11:18:20 -05:00
MascaraSnake
f79da2fb3f
Merge branch 'walltransfermovev2' into 'master'
...
Let players roll AND move after spinning off a wall transfer
Closes #274
See merge request STJr/SRB2Internal!456
2019-11-11 11:17:32 -05:00
Digiku
c2d09ac4e4
Merge branch 'new-title-multi-res' into 'master'
...
2.2 Title Screen
See merge request STJr/SRB2Internal!439
2019-11-11 08:46:36 -05:00
toaster
acc13c1a4a
* Add R_SkinUsable to Lua.
...
* Make R_SetPlayerSkin check for usability of skin before setting, and error otherwise.
2019-11-10 16:10:34 +00:00
toaster
e388b34abe
* Correctly grey out skin on MP charsel menu if skinchange is restricted.
...
* Also grey out colour if team gametype.
2019-11-10 15:21:14 +00:00
toaster
8e2cb88576
Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself.
...
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
2019-11-09 17:49:26 +00:00
toaster
98b08580f5
Fix broken dehacked table.
2019-11-09 17:17:05 +00:00
toaster
aaddfada50
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into spinny-sign
2019-11-09 16:44:06 +00:00
toaster
26e534304d
Signed/unsigned comparison error
2019-11-09 16:43:44 +00:00
toaster
2f22547889
Merge branch 'fix-players-typos' into 'master'
...
Fix silly typo :P
See merge request STJr/SRB2Internal!454
2019-11-09 11:29:18 -05:00
Louis-Antoine
068c712824
Shut up
2019-11-09 17:24:10 +01:00
Louis-Antoine
aa20e304cf
Fix silly typo :P
2019-11-09 15:46:34 +01:00
Jaime Passos
773f2efdd9
minor fixes
2019-11-09 01:45:00 -03:00
Jaime Passos
b88a37949e
Use REDFLR for missing flats
2019-11-09 00:08:22 -03:00
Jaime Passos
249cf5c8ad
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
Jaime Passos
ae838d4879
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
Jaime Passos
809f79c951
make hwrender compile
2019-11-08 22:58:41 -03:00
Jaime Passos
5f4d6c4545
Avoid running setter metamethods when not appropriate to do so
2019-11-08 22:13:50 -03:00
toaster
d8b14e54c9
Resolve #278 .
2019-11-08 21:43:39 +00:00
toaster
24e5ccec0b
Fix players being launched by slopes and pmomz when dying.
2019-11-08 19:40:40 +00:00
lachwright
3734eab7b6
Add signpost camera (and fix a typo whoops)
2019-11-09 00:47:51 +08:00
toaster
a82902a378
Minor addition: Get in the way less when doing Record Attack stuff in DEVELOP builds. (Can revert before this branch is merged, but was necessary to test...)
2019-11-08 15:48:11 +00:00
toaster
d8ad0b4eaa
STOP THE CLOCK linedef exectutor!
...
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.
Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
toaster
bb182b9ec7
Resolve #283 .
2019-11-08 13:58:53 +00:00
toaster
292791ffaf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
2019-11-08 13:02:32 +00:00
lachwright
8203c6ae90
Add support for custom sign color with var2 (shortcut for requests I sometimes got from character spriters in 2.1, e.g. neon green Pointy Sonic using a purple sign)
2019-11-08 20:09:12 +08:00
lachwright
bd9878eb48
Merge branch 'master' into spinny-sign
2019-11-08 19:59:08 +08:00
Jaime Passos
c4d7fe7c5a
finish lua spriteinfo :]
2019-11-07 23:42:14 -03:00
James R
6ac613b2ca
Move this "skin wads" check so that PK3 can work with it
2019-11-07 18:27:06 -08:00
James R
99cd5161be
Also allocate mipmap for MD2
2019-11-07 18:04:53 -08:00
James R
d2a7a87c7f
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
James R
ceb8d298c2
Fix misaligned pointers
2019-11-07 16:29:58 -08:00
James R
7a770fa63c
Lol it's the wrong union!
2019-11-07 16:22:25 -08:00
James R
b157c21a35
There's some whitespace...
2019-11-07 14:56:42 -08:00
James R
d9a54a6b61
Merge branch 'intermission-buffer' into 'master'
...
Restore the last gameplay frame while on the intermission screen
See merge request STJr/SRB2Internal!444
2019-11-07 17:53:36 -05:00
James R
e5f3863708
Merge branch 'recordattack-menu-draw-fix' into 'master'
...
Record attack fixes
See merge request STJr/SRB2Internal!441
2019-11-07 17:53:03 -05:00
James R
184a754c2e
Merge branch 'fix-nopng-warnings' into 'master'
...
Fix warnings when NOPNG=1
See merge request STJr/SRB2Internal!432
2019-11-07 17:52:31 -05:00
James R
ad4c55c10b
Merge branch 'fix-uppercase-in-intro-fades' into 'master'
...
Fix some intro fades displaying text in all-caps
See merge request STJr/SRB2Internal!429
2019-11-07 17:52:17 -05:00
James R
dcfd088aef
Merge branch 'lotsacontinues' into 'master'
...
Lotsa Continues (resolves #264 )
Closes #264
See merge request STJr/SRB2Internal!422
2019-11-07 17:52:01 -05:00
James R
546f313616
Merge branch 'secrets-charsel-music-fix' into 'master'
...
Fix char select music not playing in secrets menu
Closes #272
See merge request STJr/SRB2Internal!421
2019-11-07 17:51:38 -05:00
James R
9f24ef25bf
Better account for the uninitialised signcolor
2019-11-07 14:44:42 -08:00
James R
ed94549a37
Whitespace
2019-11-07 14:15:57 -08:00
James R
872e662618
That's a lot of whitespace
2019-11-07 13:42:54 -08:00
James R
fff38da832
var2 unused, so remove it; signcolor can be unset
2019-11-07 13:05:50 -08:00
James R
be7dcccb71
Declarations after Lua calls
2019-11-07 13:02:33 -08:00
Jaime Passos
23d89bec1d
fix accessing spriteinfo[] with a string as a key
2019-11-07 14:27:45 -03:00
