MascaraSnake
8f89ad3b72
Merge branch 'jingle-fixes' into 'master'
...
Fix some jingle resuming behavior when also changing base level music
See merge request STJr/SRB2Internal!415
2019-11-12 15:41:53 -05:00
MascaraSnake
5346d0b9e7
Merge branch 'titlemap-on-connect' into 'master'
...
Render title map on connecting to server screen too (closes #166 )
Closes #166
See merge request STJr/SRB2Internal!416
2019-11-12 15:41:07 -05:00
MascaraSnake
07228e6038
Merge branch 'nonightsbot2' into 'master'
...
Properly fix bot showing up in NiGHTS stages (resolves #261 for real).
Closes #261
See merge request STJr/SRB2Internal!417
2019-11-12 15:41:01 -05:00
MascaraSnake
f984c28dd0
Merge branch 'dashmodecut' into 'master'
...
Dashmode polish
Closes #266
See merge request STJr/SRB2Internal!418
2019-11-12 15:40:46 -05:00
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
Jaime Passos
b078b8791a
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
Jaime Passos
d4bf34b714
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-11-11 14:10:37 -03:00
Jaime Passos
33de0ad0d7
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-11 14:05:03 -03: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
Jaime Passos
a914277727
Recreate the CLUT when the palette changes
2019-11-11 00:08:38 -03:00
toaster
56bc3aa702
* 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
a2749d79a2
* 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
Jaime Passos
e32238f0b5
GIF recording
2019-11-10 00:21:48 -03:00
Jaime Passos
42472fb5f9
Fix animated flats yet again
2019-11-09 19:32:06 -03:00
Jaime Passos
66fd5fff40
Big Miss Steak
2019-11-09 17:53:05 -03: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
Jaime Passos
e8c475c1e9
Trying to make sense of chroma keying
2019-11-09 14:09:20 -03: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
Jaime Passos
d7f38ed2c9
Support OpenGL
2019-11-09 13:28:56 -03:00
Louis-Antoine
99b89b1ae3
Shut up
2019-11-09 17:24:10 +01:00
Jaime Passos
da358df562
Support animations
2019-11-09 13:23:38 -03:00
Jaime Passos
a6670be2fb
WORK!!
2019-11-09 12:22:18 -03:00
Louis-Antoine
7a9bb54a5d
Fix silly typo :P
2019-11-09 15:46:34 +01:00
Jaime Passos
06e50d1ac4
fix uninitialized pdata*
2019-11-09 02:09:10 -03:00
Jaime Passos
fc595d7a6b
minor tweaks
2019-11-09 01:50:47 -03:00
Jaime Passos
bb5ac7ce61
minor fixes
2019-11-09 01:45:00 -03:00
Jaime Passos
486df5ea7a
Flats as walls textures support, WIP, doesn't support animations yet
2019-11-09 01:36:53 -03:00
Jaime Passos
fbe850e63e
Use REDFLR for missing flats
2019-11-09 00:08:22 -03:00
Jaime Passos
911238945c
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
Jaime Passos
a1339b60ad
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
Jaime Passos
c7c6a0d5b3
make hwrender compile
2019-11-08 22:58:41 -03:00
Jaime Passos
4a93426233
Avoid running setter metamethods when not appropriate to do so
2019-11-08 22:13:50 -03: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
