MascaraSnake
1a023f1bf4
Merge branch 'knuxstuff' into 'master'
...
Knuckles changes: the fixes
See merge request STJr/SRB2Internal!428
2019-11-12 15:40:15 -05:00
MascaraSnake
aefe87f19a
Merge branch 'elementalgoop' into 'master'
...
THZ goop and Elemental (Resolve #260 , I hope?)
Closes #260
See merge request STJr/SRB2Internal!419
2019-11-11 11:42:19 -05:00
MascaraSnake
79b6f4247d
Merge branch 'spinny-sign' into 'master'
...
Papersprite end signpost
See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
MascaraSnake
2c592e9000
Merge branch 'fuck-globals' into 'master'
...
I_Error if memory allocation size overflows
See merge request STJr/SRB2Internal!426
2019-11-11 11:38:07 -05:00
MascaraSnake
04e966868d
Merge branch 'gamedata-param' into 'master'
...
Custom gamedata parameter
See merge request STJr/SRB2Internal!423
2019-11-11 11:36:53 -05:00
MascaraSnake
09f6c5e4fd
Merge branch 'rvz-cleanup' into 'master'
...
RVZ1 lag reduction
See merge request STJr/SRB2Internal!445
2019-11-11 11:29:53 -05:00
MascaraSnake
c724799bc7
Merge branch 'inflivesfix' into 'master'
...
Prevent infinite lives rollover to extremely negative numbers.
See merge request STJr/SRB2Internal!446
2019-11-11 11:25:20 -05:00
MascaraSnake
a60f3c5a42
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
9b17d375e1
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
c7e6aedd53
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
2f346a295b
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
1d2f8630e3
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
0d66099290
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
c8b47193d8
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
ad366c55ba
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
2221455ff0
Fix broken dehacked table.
2019-11-09 17:17:05 +00:00
toaster
0ddfbd3298
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into spinny-sign
2019-11-09 16:44:06 +00:00
toaster
083f72eb31
Signed/unsigned comparison error
2019-11-09 16:43:44 +00:00
toaster
3b699f92a3
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
99b89b1ae3
Shut up
2019-11-09 17:24:10 +01:00
Louis-Antoine
7a9bb54a5d
Fix silly typo :P
2019-11-09 15:46:34 +01:00
toaster
36a80c95c1
Resolve #278 .
2019-11-08 21:43:39 +00:00
toaster
65655d0377
Fix players being launched by slopes and pmomz when dying.
2019-11-08 19:40:40 +00:00
lachwright
2f4528663c
Add signpost camera (and fix a typo whoops)
2019-11-09 00:47:51 +08:00
lachwright
ea02042bae
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
46016b52e9
Merge branch 'master' into spinny-sign
2019-11-08 19:59:08 +08:00
James R
97c270d0a6
Move this "skin wads" check so that PK3 can work with it
2019-11-07 18:27:06 -08:00
James R
e255c340f0
Also allocate mipmap for MD2
2019-11-07 18:04:53 -08:00
James R
fd74f1848c
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
James R
8e5e4bfd08
Fix misaligned pointers
2019-11-07 16:29:58 -08:00
James R
50b0993e80
Lol it's the wrong union!
2019-11-07 16:22:25 -08:00
James R
7c0d5b3bcf
There's some whitespace...
2019-11-07 14:56:42 -08:00
James R
1f166741e2
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
91c759ad9f
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
7b3b89240a
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
b9a3f79f25
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
a905025354
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
fa1f335e1f
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
e8de2c39c6
Better account for the uninitialised signcolor
2019-11-07 14:44:42 -08:00
James R
d87fd3842d
Whitespace
2019-11-07 14:15:57 -08:00
James R
6ae6089343
That's a lot of whitespace
2019-11-07 13:42:54 -08:00
James R
85e3b3999b
var2 unused, so remove it; signcolor can be unset
2019-11-07 13:05:50 -08:00
James R
a2ca74b688
Declarations after Lua calls
2019-11-07 13:02:33 -08:00
toaster
9196e0905a
Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...)
2019-11-07 17:10:59 +00:00
toaster
f75d221b0f
Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.)
2019-11-07 14:06:27 +00:00
lachwright
47508ea7f8
Reduce RVZ particle spawns when no players are in proximity
2019-11-07 16:00:44 +08:00
Jaime Passos
135c841056
I guess I'll have to do at least SOMETHING about OpenGL
2019-11-05 17:35:16 -03:00
Jaime Passos
db9a8b4b94
Restore the last gameplay frame while on the intermission screen
2019-11-05 17:04:57 -03:00
lachwright
6143e7a994
Display Eggman more frequently during skin roulette
2019-11-05 01:33:09 +08:00
lachwright
eb47aa9cf9
Improve A_SignSpin
2019-11-04 23:10:13 +08:00
