MascaraSnake
|
2b3e9cd758
|
Merge branch 'more-demo-cleanup' into 'next'
More Demo code cleanup
See merge request STJr/SRB2!942
|
2020-05-16 04:52:31 -04:00 |
|
MascaraSnake
|
a36e9684fd
|
Merge branch 'signspinactiontypo' into 'next'
Fix A_SignSpin not being usable in Lua or SOC due to an error
See merge request STJr/SRB2!946
|
2020-05-16 04:49:33 -04:00 |
|
Steel Titanium
|
5853e9342d
|
Fix A_SpinSpin not being usable in Lua or SOC due to an error
|
2020-05-15 23:05:29 -04:00 |
|
MascaraSnake
|
8e6ead4a2a
|
Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next'
Fix colormap mipmap memory leak on the character select in OpenGL
See merge request STJr/SRB2!943
|
2020-05-15 16:41:19 -04:00 |
|
MascaraSnake
|
28d0514588
|
Merge branch 'nights-character-select' into 'next'
Character select in Nights mode.
See merge request STJr/SRB2!862
|
2020-05-15 16:39:38 -04:00 |
|
Jaime Passos
|
4cc0829b90
|
Fix colormap mipmap memory leak on the character select in OpenGL
|
2020-05-15 15:58:20 -03:00 |
|
MascaraSnake
|
bb03937054
|
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 |
|
Monster Iestyn
|
3c1bd4215f
|
split significant chunks of G_CheckDemoStatus into their own smaller functions, also give writing demo checksums its own little function
|
2020-05-14 20:57:21 +01:00 |
|
ZipperQR
|
88c32f7790
|
no message
|
2020-05-14 03:35:46 +03:00 |
|
MascaraSnake
|
14608b0f49
|
Merge branch 'actnum-tweaks' into 'next'
Act number tweaks
See merge request STJr/SRB2!905
|
2020-05-13 04:25:53 -04:00 |
|
MascaraSnake
|
7ea005fdc1
|
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
|
bbded108ef
|
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
|
b167f12013
|
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
|
86e2053dcd
|
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
|
be0e7e63bf
|
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
|
6878220a1b
|
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
|
62a640e282
|
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
|
2020-05-12 18:37:15 +01:00 |
|
sphere
|
948582ce4e
|
Restore SHORT().
|
2020-05-12 17:20:29 +02:00 |
|
sphere
|
4d9d125a99
|
Fix some errors and add some comments. Also, actnum is not an INT32.
|
2020-05-12 17:20:28 +02:00 |
|
sphere
|
21130dfbb0
|
Support act numbers up to 99 and draw both digits individually.
|
2020-05-12 17:17:24 +02:00 |
|
Steel Titanium
|
a491f20bee
|
Merge branch 'master' into next
|
2020-05-11 18:20:09 -04:00 |
|
SteelT
|
a43072a853
|
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
|
9e93ab4cf5
|
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
|
1c7f684f3e
|
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
|
4753c9042d
|
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
|
2020-05-11 15:01:32 -07:00 |
|
LJ Sonic
|
b0c1bf50e3
|
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
|
be67ca3203
|
Fix crash with rollout rock
|
2020-05-11 23:48:35 +02:00 |
|
James R
|
e95d2beed7
|
Update patch.pk3 asset hash
|
2020-05-11 14:41:36 -07:00 |
|
James R
|
ffd88746da
|
Update version names, SUBVERSION, MODVERSION
|
2020-05-11 14:41:36 -07:00 |
|
Monster Iestyn
|
ce3639f569
|
Merge branch 'master' into next
|
2020-05-11 20:08:02 +01:00 |
|
Zwip-Zwap Zapony
|
cb9d0a2fbe
|
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
|
ca324f7edc
|
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
|
35b4f88efe
|
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
|
2ec7a14b9d
|
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
|
67e01ad66e
|
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
|
1065ded275
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
James R
|
5ad69621f2
|
Use camera angle, not mobj angle, when comparing Angle Anchor
|
2020-05-10 19:40:28 -07:00 |
|
sphere
|
0490dc3e8e
|
Don't show the FPS counter during startup.
|
2020-05-11 01:33:34 +02:00 |
|
SteelT
|
1b4d36245f
|
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
|
f9195d6593
|
Merge branch 'next' into 2.2.3-prep
|
2020-05-10 17:05:56 -04:00 |
|
Monster Iestyn
|
d591b56ef4
|
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
|
1ea3a031da
|
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
|
a4cba6a5f9
|
Merge branch 'master' into next
|
2020-05-11 01:29:10 +08:00 |
|
Lachlan Wright
|
72c16b0761
|
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
|
7df8c24a9b
|
Merge branch 'patch_music' into 'next'
patch_music.pk3
See merge request STJr/SRB2!812
|
2020-05-10 12:51:49 -04:00 |
|
lachwright
|
10187a1e9b
|
Update MD5 hashes for player.dta and patch.pk3
|
2020-05-11 00:23:32 +08:00 |
|
Monster Iestyn
|
398770b952
|
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
|
f218920395
|
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
|
1952c30344
|
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
|
8b5becfcba
|
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 |
|