lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,013 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

10013 Commits

Author SHA1 Message Date
Jaime Passos 288d7166bc Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all 2020-05-15 16:41:39 -03:00
MascaraSnake 9cd9d2e0d7 Merge branch 'carry-dust-devil' into 'next' 
Add carry types to Dust devils

See merge request STJr/SRB2!886
 2020-05-15 02:50:29 -04:00
ZipperQR 6a9543b1c2 no message 2020-05-14 03:35:46 +03:00
MascaraSnake acdb4b42ea Merge branch 'actnum-tweaks' into 'next' 
Act number tweaks

See merge request STJr/SRB2!905
 2020-05-13 04:25:53 -04:00
MascaraSnake 9d06cb4be4 Merge branch 'fix-window-icon' into 'master' 
Fix window icon being reset when switching renderers on non-Windows platforms

See merge request STJr/SRB2!898
 2020-05-13 04:14:51 -04:00
MascaraSnake 0e2fb59650 Merge branch 'ogl-gif-fix' into 'master' 
Fix OpenGL only recording the first frame of unoptimized GIFs

See merge request STJr/SRB2!928
 2020-05-13 04:09:58 -04:00
Monster Iestyn 0f4ada3d12 Merge branch 'gcc10-fixes' into 'master' 
GCC 10 compiling fixes

See merge request STJr/SRB2!937
 2020-05-12 14:47:49 -04:00
Monster Iestyn 8c88c3dbb4 added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c) 2020-05-12 18:43:49 +01:00
Monster Iestyn 064f4bcf34 added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case) 2020-05-12 18:42:16 +01:00
Monster Iestyn dab212dc56 turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file) 2020-05-12 18:40:51 +01:00
Monster Iestyn 89cd756cd8 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 2020-05-12 18:37:15 +01:00
sphere 4eb5f09c6f Restore SHORT(). 2020-05-12 17:20:29 +02:00
sphere 0287c6956e Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
sphere 69c11a8220 Support act numbers up to 99 and draw both digits individually. 2020-05-12 17:17:24 +02:00
Steel Titanium feced5ec3c Merge branch 'master' into next 2020-05-11 18:20:09 -04:00
SteelT 78fe9af56a Merge branch 'splitscreen-titlecards-fix' into 'master' 
Fix splitscreen Title Card act name regression

See merge request STJr/SRB2!934
 2020-05-11 18:18:22 -04:00
SteelT 432cca7556 Merge branch 'menu-soc-bullshit-mergefix' into 'master' 
Menu soc bullshit mergefix

See merge request STJr/SRB2!933
 2020-05-11 18:17:59 -04:00
SteelT 0fab9d0602 Merge branch '2.2.4-prep' into 'next' 
2.2.4 preparation

See merge request STJr/SRB2!935
 2020-05-11 18:06:11 -04:00
James R e80f6497d7 Merge remote-tracking branch 'origin/next' into 2.2.4-prep 2020-05-11 15:01:32 -07:00
LJ Sonic 05ff660460 Merge branch 'fix-rollout-rock-crash' into 'next' 
Fix crash with rollout rock

See merge request STJr/SRB2!936
 2020-05-11 17:57:31 -04:00
Louis-Antoine 0c4f983eb5 Fix crash with rollout rock 2020-05-11 23:48:35 +02:00
James R a645f3a44f Update patch.pk3 asset hash 2020-05-11 14:41:36 -07:00
James R c52c8e0282 Update version names, SUBVERSION, MODVERSION 2020-05-11 14:41:36 -07:00
Monster Iestyn d508d16cef Merge branch 'master' into next 2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony 334ad93c56 Fix splitscreen Title Card act name regression 
This fixes act names not being shown on player 2's view
 2020-05-11 19:57:20 +02:00
MascaraSnake 7ca886b07d Merge branch 'showfps-fix' into 'master' 
Don't show the FPS counter during startup.

See merge request STJr/SRB2!930
 2020-05-11 13:31:26 -04:00
MascaraSnake e288c9d4f2 Merge branch 'fix-simple-camera-and-eggstatue' into 'next' 
Fix Simple Camera not working with the tutorial's statue challenge

See merge request STJr/SRB2!931
 2020-05-11 13:31:09 -04:00
MascaraSnake 7fa68d0e45 Merge branch 'delete-lua-again' into 'next' 
Fix the BotRespawn hook and hooking A_Dye being disabled for no reason

See merge request STJr/SRB2!932
 2020-05-11 13:30:18 -04:00
toaster e5bc0583e5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit 
# Conflicts:
#	src/m_menu.c
 2020-05-11 15:00:31 +01:00
James R 7257fc730a Remove instances of HAVE_BLUA that actually disable Lua now 2020-05-10 19:59:56 -07:00
James R 6b4ee94e38 Use camera angle, not mobj angle, when comparing Angle Anchor 2020-05-10 19:40:28 -07:00
sphere 61dfee7e13 Don't show the FPS counter during startup. 2020-05-11 01:33:34 +02:00
SteelT 225095afa2 Merge branch '2.2.3-prep' into 'next' 
2.2.3 preparation

See merge request STJr/SRB2!929
 2020-05-10 17:13:04 -04:00
Steel Titanium fabd76a5fe Merge branch 'next' into 2.2.3-prep 2020-05-10 17:05:56 -04:00
Monster Iestyn 49864f646e Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep 2020-05-10 20:10:11 +01:00
Monster Iestyn 197da95a23 Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj! 
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
 2020-05-10 20:09:08 +01:00
lachwright 215ff828f8 Merge branch 'master' into next 2020-05-11 01:29:10 +08:00
Lachlan Wright 4437c27bcf Merge branch '1upsound' into 'master' 
Play the 1-up sound when 1upsound is set to sound

See merge request STJr/SRB2!926
 2020-05-10 13:28:09 -04:00
Lachlan Wright 357ad68599 Merge branch 'patch_music' into 'next' 
patch_music.pk3

See merge request STJr/SRB2!812
 2020-05-10 12:51:49 -04:00
lachwright b7af502ed4 Update MD5 hashes for player.dta and patch.pk3 2020-05-11 00:23:32 +08:00
Monster Iestyn 3ce4c1b789 Fix logging on Mac 
These fixes were suggested by Sveciaost on #mac-users on Discord
 2020-05-10 16:47:01 +01:00
Monster Iestyn baee6a1d57 Update version number to 2.2.3 in all the usual files, also updated MODVERSION 2020-05-10 16:02:23 +01:00
LJ Sonic 280633019a Merge branch 'gfz3laser-mkii' into 'next' 
New Greenflower Zone 3 laser

See merge request STJr/SRB2!924
 2020-05-09 16:40:40 -04:00
LJ Sonic 62d5d16f5c Merge branch 'optimise-archiving' into 'next' 
Optimise net-archiving of Lua strings, numbers and booleans

See merge request STJr/SRB2!904
 2020-05-09 16:40:28 -04:00
Jaime Passos ab7987d1cf Fix OpenGL only recording the first frame of unoptimized GIFs 2020-05-09 16:59:09 -03:00
LJ Sonic 8a2a7a3b46 Merge branch 'showfps-tweaks' into 'next' 
FPS counter tweaks

See merge request STJr/SRB2!927
 2020-05-09 15:46:08 -04:00
sphere c55d6dbc9f Make showfps save to config, and add a compact option. 2020-05-08 15:40:50 +02:00
Lachlan 426925c5fc Play the 1-up sound when 1upsound is set to sound 2020-05-08 04:07:00 +08:00
MascaraSnake 60aa0f82f3 Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-05-07 22:00:02 +02:00
MascaraSnake 650f44566f Fixed a typo 2020-05-07 21:59:39 +02:00