James R
7e981edfcc
Merge branch 'continue_tweaks' into 'next'
...
A tangible mechanism to disable Continues
See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
Nev3r
1ea15aa643
Merge branch 't_moveplane-refactor' into 'next'
...
Remove faulty code from T_MovePlane()
See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
Nev3r
d05ad892be
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
Nev3r
608f4b6e54
Remove now unused P_MobjReadyToMove().
2020-04-13 16:00:58 +02:00
Nev3r
44426fd453
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Nev3r
8bbbd437c5
Refactor an unholy piece of code.
2020-04-13 14:31:19 +02:00
James R
8de2bab4a9
Merge branch 'pk3-xtra-comm-fix' into 'next'
...
PK3: Proper ignorance for file comments/extra data
See merge request STJr/SRB2!761
2020-04-09 21:25:11 -04:00
James R
81a01041e8
Merge remote-tracking branch 'origin/master' into next
2020-04-09 17:04:04 -07:00
James R
aff934a5b5
Merge branch 'hide-useless-1p-menu-options' into 'master'
...
Hide record & NiGHTS attack options if there are no available maps for them.
See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R
1bbb4d1f95
Merge branch 'ra-emblemhints' into 'master'
...
Allow emblem hints (and radar) in record attack.
See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
James R
b6b617cab7
Merge branch 'fix-256-brightness' into 'master'
...
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00
James R
61a4fe06d5
Merge branch 'bot-respawn-hook' into 'next'
...
BotRespawn hook
See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
James R
17082fafbd
Merge branch 'gtr-replace' into 'next'
...
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
James R
0b91ef071f
Merge branch 'sdlglcontext' into 'master'
...
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
2020-04-09 19:51:20 -04:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
ae3bf2498a
Merge branch 'supergoldedit' into 'next'
...
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
2020-04-09 19:50:06 -04:00
James R
f68a361f6e
Merge branch 'pk3-directory-start' into 'next'
...
Don't skip the first directory entry of PK3 if it's a file
See merge request STJr/SRB2!764
2020-04-09 19:49:44 -04:00
James R
7ff3e7f18b
Merge branch 'lightmemedata' into 'next'
...
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
2020-04-09 19:48:39 -04:00
James R
dc37cdf2a6
Merge branch 'loop-patch' into 'next'
...
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
2020-04-09 19:47:43 -04:00
James R
34318fbc98
Merge branch 'SF_NONIGHTSSUPER' into 'next'
...
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
2020-04-09 19:47:20 -04:00
James R
2c539300d3
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07:00
James R
483243353b
Merge branch 'lua-hook-cleanup' into 'next'
...
Lua hook cleanup
See merge request STJr/SRB2!851
2020-04-09 19:40:09 -04:00
James R
cc6649f20e
Merge branch 'fix-consbackpic' into 'master'
...
Fix console backpic
See merge request STJr/SRB2!850
2020-04-09 19:39:16 -04:00
James R
a2a4a4a321
Merge branch 'fixed2float-funcs' into 'master'
...
Turn FIXED_TO_FLOAT into a function
See merge request STJr/SRB2!869
2020-04-09 19:37:22 -04:00
sphere
aa419915d7
Use M_GametypeHasLevels again (properly this time) to save memory.
2020-04-02 17:59:56 +02:00
sphere
bc1e636cbb
Actually check for available maps correctly. Whoops!
2020-04-02 16:07:38 +02:00
Steel Titanium
c1aac7c06e
Merge branch 'master' into next
2020-03-31 20:46:54 -04:00
Louis-Antoine
dece2adbe6
Fix allowjoin off affecting single player
2020-03-30 22:11:48 +02:00
Monster Iestyn
8aed1de7de
use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now
...
(though I could pretend we still support the older ones lol)
2020-03-30 20:25:56 +01:00
Monster Iestyn
4ddb1d170a
Turn the fixed-float convert macros into inline functions, like those in GZDoom. The old macros get to be just the same as calling these inline functions.
2020-03-30 19:58:46 +01:00
Louis-Antoine
b0b21aada6
Fix disconnected players being kicked for high ping
2020-03-28 15:23:15 +01:00
toaster
0f591967ff
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
MascaraSnake
58e8ec6500
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
2020-03-25 08:34:52 +01:00
sphere
f2721604fc
Hide record/NiGHTS attack if there are no available maps for them.
2020-03-24 16:10:30 +01:00
Monster Iestyn
1677aff989
Merge branch 'demos-refactor' into 'next'
...
Demos refactor
See merge request STJr/SRB2!853
2020-03-22 17:52:45 -04:00
Monster Iestyn
0a288260fc
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Monster Iestyn
0a360e1d90
Merge branch 'fix-setspriteinfo' into 'next'
...
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
2020-03-22 16:40:34 -04:00
MascaraSnake
59899f3cce
Merge branch 'master' into next
2020-03-21 19:16:52 +01:00
LJ Sonic
fee49140e1
Merge branch 'skip-empty-gametypes' into 'master'
...
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
2020-03-21 08:52:54 -04:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Monster Iestyn
ffb2674a6e
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
fickleheart
077b4f14e2
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
2020-03-19 18:55:10 -05:00
Jaime Passos
4579c6f631
Fix lib_setSpriteInfo indexes being off-by-one
2020-03-19 19:09:34 -03:00
Monster Iestyn
45092d854f
We don't need m_cheat.h either in g_demo.c
2020-03-19 21:10:23 +00:00
Monster Iestyn
bcfbaec629
We definitely don't need these files to compile!
2020-03-19 20:43:56 +00:00
Monster Iestyn
690ccb49d8
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
2020-03-19 20:42:51 +00:00
Monster Iestyn
8ae098a1e3
update Makefile, CMakeLists.txt and MSVC project files
2020-03-19 20:13:39 +00:00
Monster Iestyn
ac7a71f85b
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Louis-Antoine
1a21da7e2b
Fix compiler warning
2020-03-19 14:40:35 +01:00