Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Disk Poppy
SRB2
Compare revisions
next to input-display
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
diskpoppy/SRB2
Select target project
No results found
input-display
Select Git revision
Swap
Target
STJr/SRB2
Select target project
STJr/SRB2
Sryder/SRB2
wolfy852/SRB2
Alpha2244/SRB2
Inuyasha/SRB2
yoshibot/SRB2
TehRealSalt/SRB2
PrisimaTF/SRB2
Hatninja/SRB2
SteelT/SRB2
james/SRB2
ShaderWraith/SRB2
SinnamonLat/SRB2
mazmazz_/SRB2
filpAM/SRB2
chaoloveicemdboy/SRB2
Whooa21/SRB2
Machturne/SRB2
Golden/SRB2
Tatsuru/SRB2
Snu/SRB2
Zwip-Zwap_Zapony/SRB2
fickleheart/SRB2
alphaRexJames/SRB2
JJK/SRB2
diskpoppy/SRB2
Hannu_Hanhi/SRB2
ZipperQR/SRB2
kays/SRB2
spherallic/SRB2
Zippy_Zolton/SRB2
namiishere/SRB2
Ors/SRB2
SMS_Alfredo/SRB2
sonic_edge/SRB2
lavla/SRB2
ashi/SRB2
X.organic/SRB2
Fafabis/SRB2
Meziu/SRB2
v-rob/SRB2
tertu/SRB2
bitten2up/SRB2
flarn2006/SRB2
Krabs/SRB2
clairebun/SRB2
Lactozilla/SRB2
thehackstack/SRB2
Spice/SRB2
win8linux/SRB2
JohnFrostFox/SRB2
talktoneon726/SRB2
Wane/SRB2
Lamibe/SRB2
spectrumuk2/srb-2
nerdyminer18/srb-2
256nil/SRB2
ARJr/SRB2
Alam/SRB2
Zenya/srb-2-marathon-demos
Acelite/srb-2-archivedmodifications
MIDIMan/SRB2
Lach/SRB2
Frostiikin/bounce-tweaks
Jaden/SRB2
Tyron/SRB2
Astronight/SRB2
Mari0shi06/SRB2
aiire/SRB2
Galactice/SRB2
srb2-ports/srb2-dreamcast
sdasdas/SRB2
chreas/srb-2-vr
StarManiaKG/the-story-of-sinically-rocketing-and-botching-the-2nd
LoganAir/SRB2
NepDisk/srb-2
alufolie91/SRB2
Felicia.iso/SRB2
twi/SRB2
BarrelsOFun/SRB2
Speed2411/SRB2
Leather_Realms/SRB2
Ayemar/SRB2
Acelite/SRB2
VladDoc/SRB2
kaldrum/model-features
strawberryfox417/SRB2
Lugent/SRB2
Rem/SRB2
Refrag/SRB2
Henry_3230/srb-3230
TehPuertoRicanSpartan2/tprs-srb2
Leminn/srb-2-marathon-stuff
chromaticpipe2/SRB2
MiguelGustavo15/SRB2
Maru/srb-2-tests
SilicDev/SRB2
UnmatchedBracket/SRB2
HybridDog/SRB2
xordspar0/SRB2
jsjhbewfhh/SRB2
Fancy2209/SRB2
Lorsoen/SRB2
shindoukin/SRB2
GamerOfDays/SRB2
Craftyawesome/SRB2
tenshi-tensai-tennoji/SRB2
Scarfdudebalder/SRB2
luigi-budd/srb-2-fix-interplag-lockon
mskluesner/SRB2
johnpetersa19/SRB2
Pheazant/SRB2
chromaticpipe2/srb2classic
romoney5/SRB2
PAS/SRB2Classic
BlueStaggo/SRB2
Jisk/srb-2-beef-jerky
117 results
next
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (3)
alwaysdisplayinput shows the input display outside of Record Attack
· 0bc9d82f
James R.
authored
5 years ago
0bc9d82f
Move the input display up instead of right
· 5e925309
James R.
authored
5 years ago
5e925309
Move the mini chat up with the input; don't show input when chat is open
· 697abf68
James R.
authored
5 years ago
697abf68
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/d_netcmd.c
+2
-0
2 additions, 0 deletions
src/d_netcmd.c
src/doomstat.h
+1
-0
1 addition, 0 deletions
src/doomstat.h
src/hu_stuff.c
+3
-0
3 additions, 0 deletions
src/hu_stuff.c
src/st_stuff.c
+8
-2
8 additions, 2 deletions
src/st_stuff.c
with
14 additions
and
2 deletions
src/d_netcmd.c
View file @
697abf68
...
@@ -199,6 +199,7 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"},
...
@@ -199,6 +199,7 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"},
static
CV_PossibleValue_t
chances_cons_t
[]
=
{{
0
,
"MIN"
},
{
9
,
"MAX"
},
{
0
,
NULL
}};
static
CV_PossibleValue_t
chances_cons_t
[]
=
{{
0
,
"MIN"
},
{
9
,
"MAX"
},
{
0
,
NULL
}};
static
CV_PossibleValue_t
pause_cons_t
[]
=
{{
0
,
"Server"
},
{
1
,
"All"
},
{
0
,
NULL
}};
static
CV_PossibleValue_t
pause_cons_t
[]
=
{{
0
,
"Server"
},
{
1
,
"All"
},
{
0
,
NULL
}};
consvar_t
cv_alwaysdisplayinput
=
{
"alwaysdisplayinput"
,
"No"
,
CV_SAVE
,
CV_YesNo
,
NULL
,
0
,
NULL
,
NULL
,
0
,
0
,
NULL
};
consvar_t
cv_showinputjoy
=
{
"showinputjoy"
,
"Off"
,
0
,
CV_OnOff
,
NULL
,
0
,
NULL
,
NULL
,
0
,
0
,
NULL
};
consvar_t
cv_showinputjoy
=
{
"showinputjoy"
,
"Off"
,
0
,
CV_OnOff
,
NULL
,
0
,
NULL
,
NULL
,
0
,
0
,
NULL
};
#ifdef NETGAME_DEVMODE
#ifdef NETGAME_DEVMODE
...
@@ -702,6 +703,7 @@ void D_RegisterClientCommands(void)
...
@@ -702,6 +703,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar
(
&
cv_timetic
);
CV_RegisterVar
(
&
cv_timetic
);
CV_RegisterVar
(
&
cv_powerupdisplay
);
CV_RegisterVar
(
&
cv_powerupdisplay
);
CV_RegisterVar
(
&
cv_itemfinder
);
CV_RegisterVar
(
&
cv_itemfinder
);
CV_RegisterVar
(
&
cv_alwaysdisplayinput
);
CV_RegisterVar
(
&
cv_showinputjoy
);
CV_RegisterVar
(
&
cv_showinputjoy
);
// time attack ghost options are also saved to config
// time attack ghost options are also saved to config
...
...
This diff is collapsed.
Click to expand it.
src/doomstat.h
View file @
697abf68
...
@@ -586,6 +586,7 @@ extern boolean singletics;
...
@@ -586,6 +586,7 @@ extern boolean singletics;
extern
consvar_t
cv_timetic
;
// display high resolution timer
extern
consvar_t
cv_timetic
;
// display high resolution timer
extern
consvar_t
cv_powerupdisplay
;
// display powerups
extern
consvar_t
cv_powerupdisplay
;
// display powerups
extern
consvar_t
cv_showinputjoy
;
// display joystick in time attack
extern
consvar_t
cv_showinputjoy
;
// display joystick in time attack
extern
consvar_t
cv_alwaysdisplayinput
;
/* even outside of time attack! */
extern
consvar_t
cv_forceskin
;
// force clients to use the server's skin
extern
consvar_t
cv_forceskin
;
// force clients to use the server's skin
extern
consvar_t
cv_downloading
;
// allow clients to downloading WADs.
extern
consvar_t
cv_downloading
;
// allow clients to downloading WADs.
extern
ticcmd_t
netcmds
[
BACKUPTICS
][
MAXPLAYERS
];
extern
ticcmd_t
netcmds
[
BACKUPTICS
][
MAXPLAYERS
];
...
...
This diff is collapsed.
Click to expand it.
src/hu_stuff.c
View file @
697abf68
...
@@ -1496,6 +1496,9 @@ static void HU_drawMiniChat(void)
...
@@ -1496,6 +1496,9 @@ static void HU_drawMiniChat(void)
y
=
chaty
-
charheight
*
(
msglines
+
1
);
y
=
chaty
-
charheight
*
(
msglines
+
1
);
if
(
cv_alwaysdisplayinput
.
value
)
y
-=
20
;
/*if (splitscreen)
/*if (splitscreen)
{
{
y -= BASEVIDHEIGHT/2;
y -= BASEVIDHEIGHT/2;
...
...
This diff is collapsed.
Click to expand it.
src/st_stuff.c
View file @
697abf68
...
@@ -980,7 +980,9 @@ static void ST_drawInput(void)
...
@@ -980,7 +980,9 @@ static void ST_drawInput(void)
INT32
x
=
hudinfo
[
HUD_LIVES
].
x
,
y
=
hudinfo
[
HUD_LIVES
].
y
;
INT32
x
=
hudinfo
[
HUD_LIVES
].
x
,
y
=
hudinfo
[
HUD_LIVES
].
y
;
if
(
stplyr
->
powers
[
pw_carry
]
==
CR_NIGHTSMODE
)
if
(
!
modeattacking
)
y
-=
24
;
else
if
(
stplyr
->
powers
[
pw_carry
]
==
CR_NIGHTSMODE
)
y
-=
16
;
y
-=
16
;
if
(
F_GetPromptHideHud
(
y
))
if
(
F_GetPromptHideHud
(
y
))
...
@@ -2685,10 +2687,14 @@ static void ST_overlayDrawer(void)
...
@@ -2685,10 +2687,14 @@ static void ST_overlayDrawer(void)
else
if
(
!
(
netgame
||
multiplayer
)
&&
cv_powerupdisplay
.
value
==
2
)
else
if
(
!
(
netgame
||
multiplayer
)
&&
cv_powerupdisplay
.
value
==
2
)
ST_drawPowerupHUD
();
// same as it ever was...
ST_drawPowerupHUD
();
// same as it ever was...
#ifdef HAVE_BLUA
if
(
!
(
netgame
||
multiplayer
)
||
!
hu_showscores
)
if
(
!
(
netgame
||
multiplayer
)
||
!
hu_showscores
)
{
if
(
!
(
modeattacking
||
chat_on
)
&&
cv_alwaysdisplayinput
.
value
)
ST_drawInput
();
#ifdef HAVE_BLUA
LUAh_GameHUD
(
stplyr
);
LUAh_GameHUD
(
stplyr
);
#endif
#endif
}
// draw level title Tails
// draw level title Tails
if
(
stagetitle
&&
(
!
WipeInAction
)
&&
(
!
WipeStageTitle
))
if
(
stagetitle
&&
(
!
WipeInAction
)
&&
(
!
WipeStageTitle
))
...
...
This diff is collapsed.
Click to expand it.