Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

private address string for CCREQ_PLAYER_INFO response. #22

Closed
wants to merge 3 commits into from
Closed

private address string for CCREQ_PLAYER_INFO response. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
050c254
private address string for CCREQ_PLAYER_INFO response.
sputnikutah Sep 26, 2023
e510d14
Merge branch 'timbergeron:qsrebase' into qsrebase
sputnikutah Feb 8, 2024
aed745f
minor tweaks
sputnikutah Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions Quake/keys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,26 @@ void Key_Console (int key)
Char_Console2(32);
return;

case K_KP_INS:
if (keydown[K_CTRL])
{
Cvar_SetValue("scr_conscale" , (glwidth / 640)); //R00k: hotkey to enlarge the interface after changing resolutions.
Cvar_SetValue("scr_menuscale", (glwidth / 640));
Cvar_SetValue("scr_sbarscale", (glwidth / 640));
}
break;

case K_TAB:
if ((key_lines[edit_line][1] == 'q')) // RAGE-QUIT AUTO SEQUENCE DETECTED
{
key_lines[edit_line][1] = 'q';
key_lines[edit_line][2] = 'u';
key_lines[edit_line][3] = 'i';
key_lines[edit_line][4] = 't';
key_lines[edit_line][5] = ';';
key_linepos += 3;
return;
}
Con_TabComplete (TABCOMPLETE_USER); // woods #iwtabcomplete
return;

Expand Down Expand Up @@ -958,9 +977,10 @@ void Key_Console (int key)
case K_INS:
if (keydown[K_SHIFT]) /* Shift-Ins paste */
PasteToConsole();
else key_insert ^= 1;
Con_TabComplete (TABCOMPLETE_AUTOHINT); // woods #iwtabcomplete
return;
else
key_insert ^= 1;
Con_TabComplete(TABCOMPLETE_AUTOHINT); // woods #iwtabcomplete
break;

case 'U':
case 'u':
Expand Down Expand Up @@ -1013,7 +1033,8 @@ void Key_Console (int key)
break;
case 'd':
case 'D':
if (keydown[K_CTRL]) { /* Ctrl+d: abort the line -- S.A */ // woods switched to D, from C #concopy
if (keydown[K_CTRL])
{ /* Ctrl+d: abort the line -- S.A */ // woods switched to D, from C #concopy
Con_Printf ("%s\n", workline);
workline[0] = ']';
workline[1] = 0;
Expand Down Expand Up @@ -1773,10 +1794,9 @@ void Key_EventWithKeycode (int key, qboolean down, int keycode)
}
}
#endif

if (cls.download.active)
if (down && (key == '.') && keydown[K_CTRL]) // woods #shortcuts #stopdownload
{
if (down && (key == '.') && keydown[K_CTRL]) // woods #shortcuts #stopdownload
if (cls.download.active)
{
Cbuf_AddText("stopdownload\n");
return;
Expand Down
3 changes: 1 addition & 2 deletions Quake/net_wins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,7 @@ const char *WINS_AddrToString (struct qsockaddr *addr, qboolean masked)
haddr = ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr);
if (masked)
{
sprintf(buffer, "%d.%d.%d.0/24", (haddr >> 24) & 0xff,
(haddr >> 16) & 0xff, (haddr >> 8) & 0xff);
sprintf(buffer, "private");
}
else
{
Expand Down
6 changes: 4 additions & 2 deletions Quake/view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,8 +890,10 @@ void V_CalcRefdef (void)
CalcGunAngle ();

view->eflags = EFLAGS_VIEWMODEL;
VectorScale(forward, 1.0/32, view->origin); //bias it very slightly sideways (so it shifts slightly when turning to mimic the 1/32 bias that used to affect it before we changed how viewmodels work)
view->origin[0] = bob*0.4; //and bob it forwards
VectorScale(forward, 0.03125f, view->origin); //bias it very slightly sideways (so it shifts slightly when turning to mimic the 1/32 bias that used to affect it before we changed how viewmodels work)

if (cl_bobcycle.value)
view->origin[0] = bob * 0.4; //and bob it forwards

if (cl.items & IT_INVISIBILITY) // woods #ringalpha
{
Expand Down
Loading