mazmazz
|
c6c83830e9
|
CMAKE: Add CCACHE support
|
2020-06-08 00:35:31 -04:00 |
|
mazmazz
|
96124286e6
|
CMAKE: Configurable CPACK generator
|
2020-06-08 00:01:15 -04:00 |
|
mazmazz
|
502de28d38
|
CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo
|
2020-06-08 00:01:15 -04:00 |
|
mazmazz
|
c74eed0a2c
|
Added SDL Mixer X to CMAKE (Windows only)
|
2020-06-08 00:01:15 -04:00 |
|
Monster Iestyn
|
0dd462c17c
|
use void rather than VOID, because the logging init code isn't exclusively Win32, whoops
|
2020-06-06 20:49:12 +01:00 |
|
Monster Iestyn
|
b493010b5e
|
Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes
See merge request STJr/SRB2!967
|
2020-06-06 15:28:48 -04:00 |
|
Monster Iestyn
|
7dd0ba0f45
|
added liolib.c to the VC10 project files, since it was missing from them
|
2020-06-06 17:38:35 +01:00 |
|
Monster Iestyn
|
d6ef2625f5
|
sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
8f776b9318
|
clean up BUGTRAP code in win32/win_main.c to avoid unmatched }
(though that said we don't officially care about the win32 folder files anymore)
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
1636c90388
|
V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?)
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
c90b8c583b
|
sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
e2e65d7fae
|
Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
d0d6f76f8e
|
P_XYMovement: initialise slopemom to all zeros
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
b9d116afb4
|
dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
e52e139793
|
G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order
|
2020-06-03 20:47:49 +01:00 |
|
Monster Iestyn
|
ef4cb40ed7
|
G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1
This way, if for some reason the ghost has no skin, nothing should spawn at all
|
2020-06-03 20:47:49 +01:00 |
|
SteelT
|
b99dd5ae98
|
Merge branch 'nowipe-fixes' into 'master'
NOWIPE fixes for colormap and title card wipes
See merge request STJr/SRB2!962
|
2020-05-28 11:30:01 -04:00 |
|
mazmazz
|
0294f8d26a
|
Fix NOWIPE bugs with colormap fade and title card
|
2020-05-25 00:20:23 -04:00 |
|
mazmazz
|
505fb1761d
|
Add NOWIPE behavaior for colormap fades
|
2020-05-25 00:19:41 -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 |
|
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 |
|