Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit 31189a9

Browse files
notheotherbennotheotherben
committed
Merge remote-tracking branch 'refs/remotes/origin/development'
2 parents 1ef60a2 + 651d3a0 commit 31189a9

12 files changed

Lines changed: 204 additions & 27 deletions

File tree

‎.nuget/NuGet.exe‎

2.08 MB
Binary file not shown.

‎.nuget/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Costura.Fody" version="0.5.2.0" targetFramework="net45" />
4-
<package id="MahApps.Metro" version="0.10.1.1" targetFramework="net45" />
5-
<package id="Rx-Main" version="2.1.30214.0" />
3+
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" />
4+
<package id="MahApps.Metro" version="1.2.4.0" targetFramework="net45" />
5+
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
66
</packages>

‎Articulate/Articulate.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
3434
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
3535
<RestorePackages>true</RestorePackages>
36-
<FodyPath>..\packages\Fody.1.17.4.0</FodyPath>
36+
<FodyPath>..\packages\Fody.1.29.4</FodyPath>
3737
</PropertyGroup>
3838
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3939
<PlatformTarget>AnyCPU</PlatformTarget>

‎Articulate/Components/CommandPool.cs‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ public static SrgsDocument BuildSrgsGrammar(CultureInfo cultureInfo)
7373
commandSet.Add(stop.Item);
7474

7575
// Wait for me (7)
76-
Command waitForMe = new Command("WAIT", new string[] { "wait for me", "wait up", "wait" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.One), DirectInputEmulator.KeyPress(DirectInputKeys.Seven) }, subjectRef);
76+
Command waitForMe = new Command("WAIT", new string[] { "wait for me", "wait up", "wait" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.One), DirectInputEmulator.KeyPress(DirectInputKeys.Six) }, subjectRef);
7777
commandObjects.Add("WAIT", waitForMe);
7878
commandSet.Add(waitForMe.Item);
7979

8080
// Find cover (8)
81-
Command cover = new Command("COVER", new string[] { "go for cover", "look for cover", "cover", "find cover", "get to cover", "hide" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.One), DirectInputEmulator.KeyPress(DirectInputKeys.Eight) }, subjectRef);
81+
Command cover = new Command("COVER", new string[] { "go for cover", "look for cover", "cover", "find cover", "get to cover", "hide" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.One), DirectInputEmulator.KeyPress(DirectInputKeys.Seven) }, subjectRef);
8282
commandObjects.Add("COVER", cover);
8383
commandSet.Add(cover.Item);
8484

8585
// Next waypoint (9)
86-
Command nextWaypoint = new Command("NEXTWAYPOINT", new string[] { "next waypoint", "go to the next waypoint" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.One), DirectInputEmulator.KeyPress(DirectInputKeys.Nine) }, subjectRef);
86+
Command nextWaypoint = new Command("NEXTWAYPOINT", new string[] { "next waypoint", "go to the next waypoint" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.One), DirectInputEmulator.KeyPress(DirectInputKeys.Eight) }, subjectRef);
8787
commandObjects.Add("NEXTWAYPOINT", nextWaypoint);
8888
commandSet.Add(nextWaypoint.Item);
8989
#endregion
@@ -157,7 +157,7 @@ public static SrgsDocument BuildSrgsGrammar(CultureInfo cultureInfo)
157157
commandObjects.Add("WATCH", watch);
158158
commandSet.Add(watch.Item);
159159

160-
// suppressive fire (9)
160+
// suppressive fire (9) -What does it do in-game?
161161
Command suppresiveFire = new Command("SUPRESS", new string[] { "suppresive fire", "suppress" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.Three), DirectInputEmulator.KeyPress(DirectInputKeys.Nine) }, subjectRef);
162162
commandObjects.Add("SUPRESS", suppresiveFire);
163163
commandSet.Add(suppresiveFire.Item);
@@ -174,7 +174,30 @@ public static SrgsDocument BuildSrgsGrammar(CultureInfo cultureInfo)
174174
commandObjects.Add("DISMOUNT", dismount);
175175
commandSet.Add(dismount.Item);
176176
#endregion
177-
177+
#region Action (5)
178+
179+
//Low fuel
180+
Command lowfuel = new Command("LOWFUEL", new string[] { "Bingo fuel", "Be advised low fuel" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.Five), DirectInputEmulator.KeyPress(DirectInputKeys.Two) }, subjectRef);
181+
commandObjects.Add("LOWFUEL", lowfuel);
182+
commandSet.Add(lowfuel.Item);
183+
184+
//Low Ammo
185+
Command lowammo = new Command("LOWAMMO", new string[] { "Running low on ammo" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.Five), DirectInputEmulator.KeyPress(DirectInputKeys.Three) }, subjectRef);
186+
commandObjects.Add("LOWAMMO", lowammo);
187+
commandSet.Add(lowammo.Item);
188+
189+
190+
//Target Neutralized
191+
Command hostiledown = new Command("HOSTILEDOWN", new string[] { "Hostile down", "Target down", "Scratch one", "He is down", "Target Neutralized" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.Five), DirectInputEmulator.KeyPress(DirectInputKeys.Seven) }, subjectRef);
192+
commandObjects.Add("HOSTILEDOWN", hostiledown);
193+
commandSet.Add(hostiledown.Item);
194+
195+
//KIA, Lost one
196+
Command friendlydown = new Command("KIA", new string[] { "We have lost one", "Man down", "He is hit", "Shit we got a man down" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.Five), DirectInputEmulator.KeyPress(DirectInputKeys.Eight) }, subjectRef);
197+
commandObjects.Add("KIA", friendlydown);
198+
commandSet.Add(friendlydown.Item);
199+
#endregion
200+
178201
#region Action (6)
179202
// open menu
180203
Command openActionMenu = new Command("OPENACTION", new string[] { "show actions", "action menu", "perform action", "do action", "open action menu", "actions" }, new [] { DirectInputEmulator.KeyPress(DirectInputKeys.Six) }, subjectRef);

‎Articulate/Components/VoiceRecognizer.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,11 @@ private void sre_SpeechRecognized(object sender, SpeechRecognizedEventArgs recog
384384
return;
385385
}
386386

387-
// Get a thread from the thread pool to execute the command
388-
CommandPool.ExecuteAsync(recognizedPhrase.Result.Semantics);
389-
}
387+
// Get a thread from the thread pool to execute the command
388+
#pragma warning disable CS4014
389+
CommandPool.ExecuteAsync(recognizedPhrase.Result.Semantics);
390+
#pragma warning restore CS4014
391+
}
390392

391393
/// <summary>
392394
/// Some speech was rejected by the voiceEngine

‎Articulate/Constants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ static class Constants
1111
/// <summary>
1212
/// The DSN used by Raven to report exceptions to a Sentry instance for tracking
1313
/// </summary>
14-
public const string SentryDSN = "http://eb3dd1c4c34c4699a63aa7f94a6ffed1:71a20430f5ba41c0b90d1ed21a019178@sentry.sierrasoftworks.com/4";
14+
public const string SentryDSN = "https://dea77c17b8c143b2bea1506ac8e68ef0:e655b40c10e64c3bb8799af142b8c13a@sentry.sierrasoftworks.com/19";
1515
}
1616
}

‎Articulate/Fody.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
AssemblyPath="@(IntermediateAssembly)"
5353
IntermediateDir="$(IntermediateDir)"
5454
KeyFilePath="$(FodyKeyFilePath)"
55-
MessageImportance="$(FodyMessageImportance)"
5655
ProjectDirectory="$(ProjectDir)"
5756
SolutionDir="$(FodySolutionDir)"
5857
References="@(ReferencePath)"
@@ -70,7 +69,6 @@
7069
AssemblyPath="$(TargetPath)"
7170
IntermediateDir="$(IntermediateDir)"
7271
KeyFilePath="$(FodyKeyFilePath)"
73-
MessageImportance="$(FodyMessageImportance)"
7472
ProjectDirectory="$(ProjectDir)"
7573
SolutionDir="$(FodySolutionDir)"
7674
References="@(ReferencePath)"

‎Articulate/Localization/hu.slt‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
translation_language = Hungarian
2+
translation_author = Gary Raven
3+
translation_website = https://github.com/geriko7
4+
5+
app_title = Articulate
6+
7+
state_offline = OFFLINE
8+
state_online = HALLGATÁS
9+
state_error = HIBA
10+
state_recognition_failed = Nem értettem amit mondtál...
11+
12+
languages_button_tooltip = Nyelv megváltoztatása
13+
languages_header = Nyelvek
14+
languages_combobox = Nyelv
15+
languages_description =
16+
Válaszd ki azt a nyelvet amit szeretnél használni. Ha ez a nyelv
17+
nem jelenik meg a menüben akkor segíts nekünk lefordítani a GitHub wikin keresztül!
18+
19+
settings_title = Beállítások
20+
settings_button_tooltip = Articulate beállításai
21+
settings_header = Beállítások
22+
23+
settings_listening_mode = Hallgatási mód
24+
listening_mode_continuous = Folyamatos
25+
listening_mode_ptt = Billentyű nyomása
26+
listening_mode_pta = Billentyű egyszeri megnyomása
27+
listening_mode_pti = Billentyű megnyomása a szünethez
28+
29+
settings_confidence = "Bizalom" szegély
30+
settings_confidence_explanation =
31+
Az érték csökkentése segíti a program fogékonyságát a pontosság árán
32+
33+
settings_command_keys = Parancs billentyűk
34+
settings_command_keys_bind = Billentyű hozzáadása
35+
settings_command_keys_bind_busy = Nyomd és Engedd el a billentyűket
36+
settings_command_keys_bind_tooltip = PTT billentyű hozzáadása
37+
settings_command_keys_explanation =
38+
Nyomj meg egy billentyűt hogy megváltoztasd a parancs billentyűt. Nyomd meg az Esc-et, hogy abbahagyd a "bindelést".
39+
Dupla kattintással eltávolíthatod a billentyűt/billentyűket.
40+
41+
settings_end_command_pause = Parancs leállítási szünet
42+
settings_end_command_pause_explanation =
43+
Az érték csökkentésével a parancsokat rövidebb szünetekben is kiadhatod,
44+
de nehezebb lesz vele a csata közepén szünetet tartani.
45+
46+
settings_key_release_pause = Billentyű lenyomási időköz
47+
settings_key_release_pause_explanation =
48+
Az érték csökkentésével a parancsokat gyorsabban végezheted el, habár ezzel a parancsok
49+
pontossága is csökkenni fog az Armában. Ammenyiben a parancsaidat nem jól hajtja végig a program,
50+
ez legyen az első amit növelned kell.
51+
52+
settings_advanced_button = Haladó Beállítások
53+
54+
settings_soundeffect_mode = Hang Effekt mód
55+
settings_soundeffect_mode_default = Alapbeállítás
56+
settings_soundeffect_mode_files = Egyedi hangok
57+
settings_soundeffect_mode_none = Semmilyen
58+
59+
error_header = Hiba
60+
error_title = Hiba üzenet
61+
error_reload = Újra
62+
63+
about_button_tooltip = Információk az Articulate szoftverről
64+
about_header = Rólunk
65+
about_title = Üdvözöllek az Articulate szoftvernél!
66+
about_text =
67+
Az Articulate egy brilliáns program, ahhoz hogy az ArmA nevű játékban a csapatodat a legkönnyebben írányíthasd. \n
68+
Bárki aki játszott az Armával, tudja, hogy a parancs menü mennyire fontos, de nagyon sok időt igényel.
69+
Az Articulate szoftvert azért készítették, hogy ezt a lehető legegyszerűbbé tegyék, a mikrofonod használatával,
70+
hogy parancsokat adhass nekik, miközben beszélsz.
71+
about_authors_title = Fejlesztők
72+
73+
main_preview_warning =
74+
Ez egy nagyon alfa verzióban álló szoftver: fontos a visszajelzés. A tapasztalatok változóak.
75+
main_bi_post = [BI Fórum]
76+
main_feedback = [Visszajelzés küldése]
77+
main_wiki = [GitHub Wiki]
78+
79+
menu_show = Előhoz
80+
menu_hide = Elrejt
81+
menu_exit = Kilépés
82+
83+
mouse_1048576 = Bal Egér
84+
mouse_2097152 = Jobb Egér
85+
mouse_8388608 = Egér 4
86+
mouse_16777216 = Egér 5
87+
88+
keyboard_8 = Backspace
89+
keyboard_9 = Tab
90+
keyboard_20 = Caps Lock
91+
keyboard_32 = Space
92+
keyboard_48 = 0
93+
keyboard_49 = 1
94+
keyboard_50 = 2
95+
keyboard_51 = 3
96+
keyboard_52 = 4
97+
keyboard_53 = 5
98+
keyboard_54 = 6
99+
keyboard_55 = 7
100+
keyboard_56 = 8
101+
keyboard_57 = 9
102+
keyboard_65 = A
103+
keyboard_66 = B
104+
keyboard_67 = C
105+
keyboard_68 = D
106+
keyboard_69 = E
107+
keyboard_70 = F
108+
keyboard_71 = G
109+
keyboard_72 = H
110+
keyboard_73 = I
111+
keyboard_74 = J
112+
keyboard_75 = K
113+
keyboard_76 = L
114+
keyboard_77 = M
115+
keyboard_78 = N
116+
keyboard_79 = O
117+
keyboard_80 = P
118+
keyboard_81 = Q
119+
keyboard_82 = R
120+
keyboard_83 = S
121+
keyboard_84 = T
122+
keyboard_85 = U
123+
keyboard_86 = V
124+
keyboard_87 = W
125+
keyboard_88 = X
126+
keyboard_89 = Y
127+
keyboard_90 = Z
128+
keyboard_91 = Bal Win
129+
keyboard_92 = Jobb Win
130+
keyboard_112 = F1
131+
keyboard_113 = F2
132+
keyboard_114 = F3
133+
keyboard_115 = F4
134+
keyboard_116 = F5
135+
keyboard_117 = F6
136+
keyboard_118 = F7
137+
keyboard_119 = F8
138+
keyboard_120 = F9
139+
keyboard_121 = F10
140+
keyboard_122 = F11
141+
keyboard_123 = F12
142+
keyboard_160 = Bal Shift
143+
keyboard_161 = Jobb Shift
144+
keybaord_162 = Bal Ctrl
145+
keyboard_163 = Jobb Ctrl
146+
keyboard_164 = Bal Alt
147+
keyboard_165 = Jobb Alt
148+
keyboard_187 = =
149+
keyboard_189 = =
150+
keyboard_192 = ~

‎Articulate/MainWindow.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
208208
}
209209

210210
Task.Factory.StartNew(LoadRecognizer);
211+
212+
App.Sentry.CaptureMessageAsync("Started", SharpRaven.Data.ErrorLevel.Info);
211213
}
212214

213215
private void Window_Closing(object sender, CancelEventArgs e)
@@ -234,6 +236,8 @@ private void LoadRecognizer()
234236
ErrorMessage = Logic.Recognizer.SetupError;
235237
ErrorFlyout.IsOpen = true;
236238
});
239+
240+
App.Sentry.CaptureMessageAsync("Recognizer Failed", SharpRaven.Data.ErrorLevel.Warning);
237241
}
238242
else
239243
{

‎Articulate/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("0.2.6.0")]
55-
[assembly: AssemblyFileVersion("0.2.6.0")]
54+
[assembly: AssemblyVersion("0.2.7.0")]
55+
[assembly: AssemblyFileVersion("0.2.7.0")]

0 commit comments

Comments
 (0)