MascaraSnake
f6f86cf139
Merge branch 'udmf-next' into udmf-colormaps
2020-03-20 12:29:17 +01:00
MascaraSnake
0ecf8616ba
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
MascaraSnake
a8f53b31b4
Merge branch 'udmf-formatcheck' into 'udmf-next'
...
Add boolean variable that indicates if current map is in UDMF format
See merge request STJr/SRB2!849
2020-03-18 09:56:45 -04:00
MascaraSnake
c2443b8e8c
Merge branch 'udmf-formatcheck' into udmf-colormaps
2020-03-15 16:26:00 +01:00
MascaraSnake
f689bc88aa
Add boolean variable that indicates if current map is in UDMF format
2020-03-15 16:23:15 +01:00
MascaraSnake
bc8a1350e4
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
3c294b5e3d
Merge branch 'next' into udmf-next
2020-03-15 09:57:42 +01:00
MascaraSnake
e545e5f9ba
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
Steel Titanium
efab0f479c
Merge branch 'master' into next
2020-03-14 22:21:12 -04:00
SteelT
49001b207e
Merge branch 'nadraw-fix' into 'master'
...
Fix NiGHTS Attack crash after render mode change
See merge request STJr/SRB2!837
2020-03-14 22:19:35 -04:00
SteelT
88fff119ea
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
SteelT
e80a09a651
Merge branch 'tex' into 'master'
...
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
SteelT
2d16281d86
Merge branch 'acz-fence' into 'master'
...
Fix ASTBlendPixel blending with nothing
See merge request STJr/SRB2!827
2020-03-14 22:11:23 -04:00
Nev3r
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
ddc0762ecc
Merge branch 'master' into next
2020-03-09 19:53:08 +00:00
Monster Iestyn
db6a3bbd1f
Merge branch 'archive-sprite2-hotfix' into 'master'
...
Archive sprite2 Hotfix
See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
LJ Sonic
5e705b84ae
Merge branch 'patch-1' into 'master'
...
Fix desyncs never recovering if node and player mismatch
See merge request STJr/SRB2!842
2020-03-09 12:56:41 -04:00
Monster Iestyn
40e728fdb5
One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
...
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
colette
ce29129f3a
Fix resyncs never recovering if node and player mismatch
2020-03-08 13:09:39 -04:00
SteelT
bb56aa603f
Merge branch 'ss-damage-fix' into 'next'
...
Fix Special Stages crashing upon taking damage
See merge request STJr/SRB2!839
2020-03-06 17:59:57 -05:00
Zipper
4b28e19d16
Update p_inter.c
2020-03-05 18:48:20 -05:00
Zipper
4d8a523da9
Update p_inter.c
2020-03-05 18:30:27 -05:00
ZipperQR
da9bf34175
fix source player being nil
2020-03-05 12:26:27 +03:00
Jaime Passos
b8db3e2216
Fix NiGHTS Attack crash after render mode change
2020-03-04 09:42:34 -03:00
SteelT
039aeed633
Merge branch 'tolflag-fix' into 'next'
...
Fix G_TOLFlag returning the wrong type
See merge request STJr/SRB2!834
2020-03-02 21:27:45 -05:00
Steel Titanium
10d08fc8bb
Merge branch 'master' into next
2020-03-02 15:26:01 -05:00
SteelT
7d14796954
Merge branch 'fix-ogllib' into 'master'
...
Fix -OGLlib
See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
Jaime Passos
67b8a7eb67
Merge remote-tracking branch 'origin/next' into tolflag-fix
2020-03-02 13:14:12 -03:00
LJ Sonic
75e12f9d9d
Merge branch 'fix-io-warning' into 'next'
...
Fix compiler warning
See merge request STJr/SRB2!833
2020-03-02 07:46:46 -05:00
Louis-Antoine
7ba93c184f
Fix warning and formatting
2020-03-02 13:33:12 +01:00
Jaime Passos
70a103b9af
Fix G_TOLFlag returning the wrong type
2020-03-02 00:20:53 -03:00
Jaime Passos
76bda716cd
Merge branch 'tol-moment' into 'next'
...
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
See merge request STJr/SRB2!825
2020-03-01 11:14:29 -05:00
LJ Sonic
2cace6e147
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
Jaime Passos
94107a5320
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03:00
Monster Iestyn
cf95837a76
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05:00
Jaime Passos
4a489c4d95
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
9b88edc458
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
48b352049f
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
Jaime Passos
4446b0d563
Fix ACZ fence texture
2020-02-28 17:33:58 -03:00
Jaime Passos
7f32a53233
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
2020-02-28 17:31:41 -03:00
Jaime Passos
4abe112af8
Merge remote-tracking branch 'origin/master' into next
2020-02-25 22:43:15 -03:00
Jaime Passos
8350a8c58a
Merge branch 'new-color-chat-fix' into 'master'
...
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
2020-02-25 20:38:36 -05:00
Jaime Passos
b9fb6182ac
Merge branch 'amycrash' into 'master'
...
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
See merge request STJr/SRB2!823
2020-02-25 20:38:15 -05:00
Jaime Passos
25cf369f22
Fix (technically functional) string comparison counting an extra character in the comparison length
2020-02-25 22:34:19 -03:00
Jaime Passos
3d7cd29eda
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
2020-02-25 22:30:34 -03:00
LJ Sonic
8dd4e47a35
Merge branch 'realmo' into 'next'
...
Let Lua access spectator mobjs
See merge request STJr/SRB2!756
2020-02-25 15:06:29 -05:00
Jaime Passos
fe93155578
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
Steel Titanium
ce801e1076
Fix new skin colors using default chat color
2020-02-24 16:58:19 -05:00
Jaime Passos
ebafd4b2c6
Merge branch 'spectator-is-it' into 'next'
...
Don't get chosen as the tagger if you're a spectator
See merge request STJr/SRB2!815
2020-02-23 20:37:27 -05:00
