Skip to content

Proto Synchronization — deadem (Auto) #14

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

Open
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Proto Synchronization — deadem (Auto) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/deadem/proto/compiled/proto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,9 @@
},
"k_EPingMarkerInfo_OnlyMiniMap": {
"(schema_friendly_name)": "Only show on Minimap, no world, no sound"
},
"k_EPingMarkerInfo_NoMarkerYesSoundMiniMap": {
"(schema_friendly_name)": "No World, Just Minimap and sound"
}
},
"values": {
Expand All @@ -1255,7 +1258,8 @@
"k_EPingMarkerInfo_HideMarkerAndSound": 2,
"k_EPingMarkerInfo_OnlyShowMarker": 3,
"k_EPingMarkerInfo_OnlyPlaySound": 4,
"k_EPingMarkerInfo_OnlyMiniMap": 5
"k_EPingMarkerInfo_OnlyMiniMap": 5,
"k_EPingMarkerInfo_NoMarkerYesSoundMiniMap": 6
}
},
"CameraOperation": {
Expand Down
1 change: 1 addition & 0 deletions packages/deadem/proto/source/citadel_usermessages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ enum ChatMsgPingMarkerInfo {
k_EPingMarkerInfo_OnlyShowMarker = 3 [(schema_friendly_name) = "Only Show Ping Indicator at Ping Location (no ping sound)"];
k_EPingMarkerInfo_OnlyPlaySound = 4 [(schema_friendly_name) = "Only Play Ping Sound (and VO)"];
k_EPingMarkerInfo_OnlyMiniMap = 5 [(schema_friendly_name) = "Only show on Minimap, no world, no sound"];
k_EPingMarkerInfo_NoMarkerYesSoundMiniMap = 6 [(schema_friendly_name) = "No World, Just Minimap and sound"];
}

enum CameraOperation {
Expand Down
6 changes: 3 additions & 3 deletions packages/deadem/proto/source/usermessages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ message CUserMessageSendAudio {
}

message CUserMessageAudioParameter {
optional uint32 parameter_type = 1 [default = 0];
optional uint32 name_hash_code = 2 [default = 0];
optional uint32 parameter_type = 1;
optional uint32 name_hash_code = 2;
optional float value = 3;
optional uint32 int_value = 4;
}
Expand Down Expand Up @@ -664,7 +664,7 @@ message CUserMessageHapticsManagerPulse {

message CUserMessageHapticsManagerEffect {
optional int32 hand_id = 1;
optional uint32 effect_name_hash_code = 2 [default = 0];
optional uint32 effect_name_hash_code = 2;
optional float effect_scale = 3;
}

Expand Down