Merge branch 'develop' into feature/asw-response-system

# Conflicts:
#	sp/src/game/server/server_mapbase.vpc
This commit is contained in:
Blixibon
2021-04-21 16:51:36 -05:00
94 changed files with 6183 additions and 774 deletions

View File

@@ -32,6 +32,9 @@ $Project
$File "c_postprocesscontroller.cpp"
$File "c_postprocesscontroller.h"
$File "c_env_dof_controller.cpp"
$File "c_movie_display.cpp"
$File "c_movie_display.h"
$File "vgui_movie_display.cpp"
$Folder "Mapbase"
{
@@ -58,6 +61,7 @@ $Project
$File "mapbase\c_func_fake_worldportal.cpp"
$File "mapbase\c_func_fake_worldportal.h"
$File "mapbase\c_point_glow.cpp"
$File "mapbase\c_vgui_text_display.cpp"
}
$Folder "HL2 DLL"