stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-19 17:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
9663 commits 172 branches 41 tags 280 MiB
Commit graph

9663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zachary McAlpin
b067d1e134 Revert "Call `LUAh_GameQuit` in 2 places." 
This reverts commit a329ca43ba.
 2020-03-15 00:08:57 -05:00
Zachary McAlpin
a329ca43ba Call `LUAh_GameQuit` in 2 places. 2020-03-15 00:53:05 -04:00
Zachary McAlpin
de9dc43b21 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-03-14 22:55:40 -05: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
Zachary McAlpin
f97187f59b Revert "Call LUAh_GameQuit in Command_ExitGame_f" 
This reverts commit 2b16971137.
 2020-03-12 22:31:48 -05:00
Zachary McAlpin
7ec241c59e Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game" 
This reverts commit bef49f5660.
 2020-03-12 22:31:39 -05:00
Zachary McAlpin
bef49f5660 Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game 2020-03-12 20:51:16 -05:00
Zachary McAlpin
2b16971137 Call LUAh_GameQuit in Command_ExitGame_f 2020-03-12 20:15:21 -05:00
Zachary McAlpin
4d144f2e40 No longer call LUAh_GameQuit in D_QuitNetGame 2020-03-12 19:59:50 -05:00
Zachary McAlpin
4d7f64a53d Let's call LUAh_GameQuit in D_QuitNetGame since that function is still called outside of netgames 
However, the D_QuitNetGame function returns early if you are not in a netgame.
 2020-03-12 12:45:41 -05:00
Zachary McAlpin
bb08b55b43 Created GameQuit hook, but I need to decide where to execute it 2020-03-12 12:22:04 -05: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