celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	sp/src/game/server/server_mapbase.vpc
This commit is contained in:
Blixibon
2021-04-21 16:51:36 -05:00
parent 1a6f1f0cab 62c6c3cb6b
commit e31c45dee3
94 changed files with 6183 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sp/src/game/server/server_mapbase.vpc
View File

@@ -28,6 +28,8 @@ $Project
$File "postprocesscontroller.h"
$File "env_dof_controller.cpp"
$File "env_dof_controller.h"
$File "logic_playmovie.cpp"
$File "movie_display.cpp"
$File "ai_expresserfollowup.cpp" [$NEW_RESPONSE_SYSTEM]
$File "ai_speechqueue.cpp" [$NEW_RESPONSE_SYSTEM]
$File "ai_speechqueue.h" [$NEW_RESPONSE_SYSTEM]
@@ -78,6 +80,7 @@ $Project
$File "mapbase\SystemConvarMod.cpp"
$File "mapbase\SystemConvarMod.h"
$File "mapbase\variant_tools.h"
$File "mapbase\vgui_text_display.cpp"
$File "mapbase\logic_eventlistener.cpp"
$File "mapbase\logic_register_activator.cpp"