OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/r_things.cpp
This commit is contained in:
Magnus Norddahl 2017-01-18 04:09:16 +01:00
commit 53a79ca215
49 changed files with 1336 additions and 1275 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c_console.cpp
View file

@ -1330,6 +1330,12 @@ void C_HideConsole ()
}
}
DEFINE_ACTION_FUNCTION(_Console, HideConsole)
{
C_HideConsole();
return 0;
}
static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
{
int data1 = ev->data1;