Skip to content

Commit

Permalink
M BuildbotPaths/csgo/client.txt, M Protobufs/csgo/base_gcmessages.pro…
Browse files Browse the repository at this point in the history 
…to, M Protobufs/csgo/cstrike15_gcmessages.proto, M Protobufs/csgo/cstrike15_usermessages.proto, M Protobufs/csgo/gcsdk_gcmessages.proto, M Protobufs/csgo/netmessages.proto, A Protobufs/csgo/network_connection.proto, M Strings/csgo/client.txt, M csgo/csgo/scripts/game_options.txt
  • Loading branch information
@SteamDB-Tracker
SteamDB-Tracker committed Dec 9, 2015
1 parent af5f161 commit d19ea48
Show file tree
Hide file tree
Showing 9 changed files with 315 additions and 79 deletions.
1 change: 1 addition & 0 deletions BuildbotPaths/csgo/client.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../game/client/generated_proto/gcsdk_gcmessages.pb.cc
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../game/client/generated_proto/gcsystemmsgs.pb.cc
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../game/client/generated_proto/netmessages.pb.cc
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../game/client/generated_proto/network_connection.pb.cc
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../game/shared/cstrike15/weapon_csbase.cpp
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../game/shared/predictioncopy.cpp
/Users/buildbot/buildslave/csgo_pcbeta_osx/build/src/game/client/../../public/studio.cpp
Expand Down
3 changes: 2 additions & 1 deletion Protobufs/csgo/base_gcmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,9 @@ message CMsgSetPresetItemPosition {

message CMsgSetItemPositions {
message ItemPosition {
optional uint32 item_id = 1;
optional uint32 legacy_item_id = 1;
optional uint32 position = 2;
optional uint64 item_id = 3;
}

repeated .CMsgSetItemPositions.ItemPosition item_positions = 1;
Expand Down
14 changes: 5 additions & 9 deletions Protobufs/csgo/cstrike15_gcmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,12 +373,14 @@ message CMsgGCCStrike15_v2_MatchmakingServerReservationResponse {
optional uint32 reward_item_attr_reward_idx = 11;
optional uint32 reward_drop_list = 12;
optional string tournament_tag = 13;
optional uint32 steamdatagram_port = 14;
}

message CMsgGCCStrike15_v2_MatchmakingGC2ClientReserve {
optional uint64 serverid = 1;
optional uint32 serverip = 2;
optional uint32 serverport = 3;
optional string server_address = 7;
optional uint32 legacy_serverip = 2;
optional uint32 legacy_serverport = 3;
optional uint64 reservationid = 4;
optional .CMsgGCCStrike15_v2_MatchmakingGC2ServerReserve reservation = 5;
optional string map = 6;
Expand Down Expand Up @@ -473,13 +475,6 @@ message CMsgGCCStrike15_v2_MatchmakingServer2GCKick {
optional uint32 reason = 3;
}

message CDataGCCStrike15_v2_MatchmakingLockedInMatch {
optional .CMsgGCCStrike15_v2_MatchmakingGC2ClientReserve client_reservation = 1;
optional .CMsgGCCStrike15_v2_MatchmakingServerRoundStats server_stats = 2;
optional uint32 rtime32_server_info = 3;
optional .CMsgGCCStrike15_v2_MatchmakingServerRoundStats last_round_stats_temp = 4;
}

message CMsgGCCStrike15_v2_MatchmakingGC2ServerRankUpdate {
repeated .PlayerRankingInfo rankings = 1;
optional uint64 match_id = 2;
Expand Down Expand Up @@ -518,6 +513,7 @@ message CMsgGCCStrike15_v2_ClientReportServer {
optional uint32 rpt_abusivemodels = 2;
optional uint32 rpt_badmotd = 3;
optional uint32 rpt_listingabuse = 4;
optional uint32 rpt_inventoryabuse = 5;
optional uint64 match_id = 8;
}

Expand Down
1 change: 1 addition & 0 deletions Protobufs/csgo/cstrike15_usermessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ message CCSUsrMsg_VoiceMask {
message CCSUsrMsg_Damage {
optional int32 amount = 1;
optional .CMsgVector inflictor_world_pos = 2;
optional int32 victim_entindex = 3;
}

message CCSUsrMsg_RadioText {
Expand Down
8 changes: 8 additions & 0 deletions Protobufs/csgo/gcsdk_gcmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ message CMsgClientHello {
optional uint32 client_launcher = 4;
}

message CMsgServerHello {
optional uint32 version = 1;
repeated .CMsgSOCacheHaveVersion socache_have_versions = 2;
optional uint32 legacy_client_session_need = 3;
optional uint32 legacy_client_launcher = 4;
optional uint32 steamdatagram_port = 5;
}

message CMsgClientWelcome {
message Location {
optional float latitude = 1;
Expand Down
29 changes: 29 additions & 0 deletions Protobufs/csgo/netmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ enum CLC_Messages {
clc_SplitPlayerConnect = 16;
clc_ClientMessage = 17;
clc_CmdKeyValues = 18;
clc_HltvReplay = 20;
}

enum VoiceDataFormat_t {
Expand Down Expand Up @@ -68,6 +69,13 @@ enum SVC_Messages {
svc_PaintmapData = 33;
svc_CmdKeyValues = 34;
svc_EncryptedData = 35;
svc_HltvReplay = 36;
}

enum ReplayEventType_t {
REPLAY_EVENT_CANCEL = 0;
REPLAY_EVENT_DEATH = 1;
REPLAY_EVENT_GENERIC = 2;
}

message CMsgVector {
Expand Down Expand Up @@ -99,6 +107,7 @@ message CNETMsg_Tick {
optional uint32 host_computationtime = 4;
optional uint32 host_computationtime_std_deviation = 5;
optional uint32 host_framestarttime_std_deviation = 6;
optional uint32 hltv_replay_flags = 7;
}

message CNETMsg_StringCmd {
Expand Down Expand Up @@ -360,6 +369,7 @@ message CSVCMsg_Menu {
message CSVCMsg_UserMessage {
optional int32 msg_type = 1;
optional bytes msg_data = 2;
optional int32 passthrough = 3;
}

message CSVCMsg_PaintmapData {
Expand All @@ -382,6 +392,7 @@ message CSVCMsg_GameEvent {
optional string event_name = 1;
optional int32 eventid = 2;
repeated .CSVCMsg_GameEvent.key_t keys = 3;
optional int32 passthrough = 4;
}

message CSVCMsg_GameEventList {
Expand Down Expand Up @@ -455,3 +466,21 @@ message CSVCMsg_EncryptedData {
optional int32 key_type = 2;
}

message CSVCMsg_HltvReplay {
optional int32 delay = 1;
optional int32 primary_target = 2;
optional int32 replay_stop_at = 3;
optional int32 replay_start_at = 4;
optional int32 replay_slowdown_begin = 5;
optional int32 replay_slowdown_end = 6;
optional float replay_slowdown_rate = 7;
}

message CCLCMsg_HltvReplay {
optional int32 request = 1;
optional float slowdown_length = 2;
optional float slowdown_rate = 3;
optional int32 primary_target_ent_index = 4;
optional float event_time = 5;
}

71 changes: 71 additions & 0 deletions Protobufs/csgo/network_connection.proto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import "google/protobuf/descriptor.proto";

option cc_generic_services = false;

extend .google.protobuf.EnumValueOptions {
optional string network_connection_token = 50500;
}

enum ENetworkDisconnectionReason {
NETWORK_DISCONNECT_INVALID = 0;
NETWORK_DISCONNECT_SHUTDOWN = 1;
NETWORK_DISCONNECT_DISCONNECT_BY_USER = 2 [(network_connection_token) = "#GameUI_Disconnect_User"];
NETWORK_DISCONNECT_DISCONNECT_BY_SERVER = 3 [(network_connection_token) = "#GameUI_Disconnect_Server"];
NETWORK_DISCONNECT_LOST = 4 [(network_connection_token) = "#GameUI_Disconnect_ConnectionLost"];
NETWORK_DISCONNECT_OVERFLOW = 5 [(network_connection_token) = "#GameUI_Disconnect_ConnectionOverflow"];
NETWORK_DISCONNECT_STEAM_BANNED = 6 [(network_connection_token) = "#GameUI_Disconnect_SteamIDBanned"];
NETWORK_DISCONNECT_STEAM_INUSE = 7 [(network_connection_token) = "#GameUI_Disconnect_SteamIDInUse"];
NETWORK_DISCONNECT_STEAM_TICKET = 8 [(network_connection_token) = "#GameUI_Disconnect_SteamTicket"];
NETWORK_DISCONNECT_STEAM_LOGON = 9 [(network_connection_token) = "#GameUI_Disconnect_SteamLogon"];
NETWORK_DISCONNECT_STEAM_AUTHCANCELLED = 10 [(network_connection_token) = "#GameUI_Disconnect_SteamLogon"];
NETWORK_DISCONNECT_STEAM_AUTHALREADYUSED = 11 [(network_connection_token) = "#GameUI_Disconnect_SteamLogon"];
NETWORK_DISCONNECT_STEAM_AUTHINVALID = 12 [(network_connection_token) = "#GameUI_Disconnect_SteamLogon"];
NETWORK_DISCONNECT_STEAM_VACBANSTATE = 13 [(network_connection_token) = "#GameUI_Disconnect_SteamVAC"];
NETWORK_DISCONNECT_STEAM_LOGGED_IN_ELSEWHERE = 14 [(network_connection_token) = "#GameUI_Disconnect_SteamInUse"];
NETWORK_DISCONNECT_STEAM_VAC_CHECK_TIMEDOUT = 15 [(network_connection_token) = "#GameUI_Disconnect_SteamTimeOut"];
NETWORK_DISCONNECT_STEAM_DROPPED = 16 [(network_connection_token) = "#GameUI_Disconnect_SteamDropped"];
NETWORK_DISCONNECT_STEAM_OWNERSHIP = 17 [(network_connection_token) = "#GameUI_Disconnect_SteamOwnership"];
NETWORK_DISCONNECT_SERVERINFO_OVERFLOW = 18 [(network_connection_token) = "#GameUI_Disconnect_ServerInfoOverflow"];
NETWORK_DISCONNECT_TICKMSG_OVERFLOW = 19 [(network_connection_token) = "#GameUI_Disconnect_TickMessage"];
NETWORK_DISCONNECT_STRINGTABLEMSG_OVERFLOW = 20 [(network_connection_token) = "#GameUI_Disconnect_StringTableMessage"];
NETWORK_DISCONNECT_DELTAENTMSG_OVERFLOW = 21 [(network_connection_token) = "#GameUI_Disconnect_DeltaEntMessage"];
NETWORK_DISCONNECT_TEMPENTMSG_OVERFLOW = 22 [(network_connection_token) = "#GameUI_Disconnect_TempEntMessage"];
NETWORK_DISCONNECT_SOUNDSMSG_OVERFLOW = 23 [(network_connection_token) = "#GameUI_Disconnect_SoundsMessage"];
NETWORK_DISCONNECT_SNAPSHOTOVERFLOW = 24 [(network_connection_token) = "#GameUI_Disconnect_SnapshotOverflow"];
NETWORK_DISCONNECT_SNAPSHOTERROR = 25 [(network_connection_token) = "#GameUI_Disconnect_SnapshotError"];
NETWORK_DISCONNECT_RELIABLEOVERFLOW = 26 [(network_connection_token) = "#GameUI_Disconnect_ReliableOverflow"];
NETWORK_DISCONNECT_BADDELTATICK = 27 [(network_connection_token) = "#GameUI_Disconnect_BadClientDeltaTick"];
NETWORK_DISCONNECT_NOMORESPLITS = 28 [(network_connection_token) = "#GameUI_Disconnect_NoMoreSplits"];
NETWORK_DISCONNECT_TIMEDOUT = 29 [(network_connection_token) = "#GameUI_Disconnect_TimedOut"];
NETWORK_DISCONNECT_DISCONNECTED = 30 [(network_connection_token) = "#GameUI_Disconnect_Disconnected"];
NETWORK_DISCONNECT_LEAVINGSPLIT = 31 [(network_connection_token) = "#GameUI_Disconnect_LeavingSplit"];
NETWORK_DISCONNECT_DIFFERENTCLASSTABLES = 32 [(network_connection_token) = "#GameUI_Disconnect_DifferentClassTables"];
NETWORK_DISCONNECT_BADRELAYPASSWORD = 33 [(network_connection_token) = "#GameUI_Disconnect_BadRelayPassword"];
NETWORK_DISCONNECT_BADSPECTATORPASSWORD = 34 [(network_connection_token) = "#GameUI_Disconnect_BadSpectatorPassword"];
NETWORK_DISCONNECT_HLTVRESTRICTED = 35 [(network_connection_token) = "#GameUI_Disconnect_HLTVRestricted"];
NETWORK_DISCONNECT_NOSPECTATORS = 36 [(network_connection_token) = "#GameUI_Disconnect_NoSpectators"];
NETWORK_DISCONNECT_HLTVUNAVAILABLE = 37 [(network_connection_token) = "#GameUI_Disconnect_HLTVUnavailable"];
NETWORK_DISCONNECT_HLTVSTOP = 38 [(network_connection_token) = "#GameUI_Disconnect_HLTVStop"];
NETWORK_DISCONNECT_KICKED = 39 [(network_connection_token) = "#GameUI_Disconnect_Kicked"];
NETWORK_DISCONNECT_BANADDED = 40 [(network_connection_token) = "#GameUI_Disconnect_BanAdded"];
NETWORK_DISCONNECT_KICKBANADDED = 41 [(network_connection_token) = "#GameUI_Disconnect_KickBanAdded"];
NETWORK_DISCONNECT_HLTVDIRECT = 42 [(network_connection_token) = "#GameUI_Disconnect_HLTVDirect"];
NETWORK_DISCONNECT_PURESERVER_CLIENTEXTRA = 43 [(network_connection_token) = "#GameUI_Disconnect_PureServer_ClientExtra"];
NETWORK_DISCONNECT_PURESERVER_MISMATCH = 44 [(network_connection_token) = "#GameUI_Disconnect_PureServer_Mismatch"];
NETWORK_DISCONNECT_USERCMD = 45 [(network_connection_token) = "#GameUI_Disconnect_UserCmd"];
NETWORK_DISCONNECT_REJECTED_BY_GAME = 46 [(network_connection_token) = "#GameUI_Disconnect_RejectedByGame"];
NETWORK_DISCONNECT_MESSAGE_PARSE_ERROR = 47 [(network_connection_token) = "#GameUI_Disconnect_MessageParseError"];
NETWORK_DISCONNECT_INVALID_MESSAGE_ERROR = 48 [(network_connection_token) = "#GameUI_Disconnect_InvalidMessageError"];
NETWORK_DISCONNECT_BAD_SERVER_PASSWORD = 49 [(network_connection_token) = "#GameUI_Disconnect_BadServerPassword"];
NETWORK_DISCONNECT_DIRECT_CONNECT_RESERVATION = 50 [(network_connection_token) = "#GameUI_Disconnect_DirectConnectReservation"];
NETWORK_DISCONNECT_CONNECTION_FAILURE = 51 [(network_connection_token) = "#GameUI_Disconnect_ConnectionFailure"];
NETWORK_DISCONNECT_NO_PEER_GROUP_HANDLERS = 52 [(network_connection_token) = "#GameUI_Disconnect_NoPeerGroupHandlers"];
NETWORK_DISCONNECT_RECONNECTION = 53 [(network_connection_token) = "#GameUI_Disconnect_Reconnection"];
NETWORK_DISCONNECT_CONNECTION_CLOSING = 54 [(network_connection_token) = "#GameUI_Disconnect_ConnectionClosing"];
NETWORK_DISCONNECT_NO_GOTV_RELAYS_AVAILABLE = 55 [(network_connection_token) = "#GameUI_Disconnect_NoGOTVRelaysAvailable"];
NETWORK_DISCONNECT_SESSION_MIGRATED = 56 [(network_connection_token) = "#GameUI_Disconnect_SessionMigrated"];
NETWORK_DISCONNECT_VERYLARGETRANSFEROVERFLOW = 57 [(network_connection_token) = "#GameUI_Disconnect_VeryLargeTransferOverflow"];
NETWORK_DISCONNECT_SENDNETOVERFLOW = 58 [(network_connection_token) = "#GameUI_Disconnect_SendNetOverflow"];
NETWORK_DISCONNECT_PLAYER_REMOVED_FROM_HOST_SESSION = 59 [(network_connection_token) = "#GameUI_Disconnect_PlayerRemovedFromHostSession"];
}

Loading

0 comments on commit d19ea48

Please sign in to comment.