Skip to content

Commit 8415a83

Browse files
author
kabir-plod
authored
Support wireless buzzers (#1)
* Remove unnecessary files from git * Packaging improvements * Add websocket server * Stop server on application exit * Handle double registration of wireless buzzers * Better icon at lower resolutions * Buzzer registration and click events working * Ws server doesn't restart on backspace * Right click on master mouse resets game window * Update README * Lock team colour and mouse after registration/confirmation
1 parent cf70548 commit 8415a83

File tree

119 files changed

+8313
-3079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+8313
-3079
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.vs
2+
**/obj
3+
**/bin
4+
*.psess
5+
*.vsp
6+
*.vspx

.vs/Quiz-o-matic 9000 v2/v14/.suo

-49 KB
Binary file not shown.

.vs/Quiz-o-matic 9000/v14/.suo

-116 KB
Binary file not shown.

Quiz-o-matic 9000/App.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
55
</startup>
6-
</configuration>
6+
</configuration>

Quiz-o-matic 9000/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
// General Information about an assembly is controlled through the following
88
// set of attributes. Change these attribute values to modify the information
99
// associated with an assembly.
10-
[assembly: AssemblyTitle("Quiz-o-matic 9000 v2")]
10+
[assembly: AssemblyTitle("Quiz-o-matic 9000")]
1111
[assembly: AssemblyDescription("")]
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("")]
14-
[assembly: AssemblyProduct("Quiz-o-matic 9000 v2")]
15-
[assembly: AssemblyCopyright("Copyright © 2017")]
14+
[assembly: AssemblyProduct("Quiz-o-matic 9000")]
15+
[assembly: AssemblyCopyright("")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

Quiz-o-matic 9000/Properties/Resources.Designer.cs

+50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Quiz-o-matic 9000/Properties/Resources.resx

+24-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
4747
mimetype: application/x-microsoft.net.object.binary.base64
4848
value : The object must be serialized with
49-
: System.Serialization.Formatters.Binary.BinaryFormatter
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
5151
5252
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
6060
: and then encoded with base64 encoding.
6161
-->
6262
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6364
<xsd:element name="root" msdata:IsDataSet="true">
6465
<xsd:complexType>
6566
<xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
6869
<xsd:sequence>
6970
<xsd:element name="value" type="xsd:string" minOccurs="0" />
7071
</xsd:sequence>
71-
<xsd:attribute name="name" type="xsd:string" />
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
7273
<xsd:attribute name="type" type="xsd:string" />
7374
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
7476
</xsd:complexType>
7577
</xsd:element>
7678
<xsd:element name="assembly">
@@ -85,9 +87,10 @@
8587
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
8688
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
8789
</xsd:sequence>
88-
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
8991
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
9092
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
9194
</xsd:complexType>
9295
</xsd:element>
9396
<xsd:element name="resheader">
@@ -109,9 +112,25 @@
109112
<value>2.0</value>
110113
</resheader>
111114
<resheader name="reader">
112-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
113116
</resheader>
114117
<resheader name="writer">
115-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116119
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="Arvo_Regular" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\fonts\Arvo-Regular.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123+
</data>
124+
<data name="bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\img\bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126+
</data>
127+
<data name="blank_cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
128+
<value>..\img\blank_cursor.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129+
</data>
130+
<data name="default_cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
131+
<value>..\img\default_cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132+
</data>
133+
<data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
134+
<value>..\img\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
135+
</data>
117136
</root>

Quiz-o-matic 9000/Quiz-o-matic 9000.csproj

+16-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Quiz_o_matic_9000</RootNamespace>
1111
<AssemblyName>Quiz-o-matic 9000</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
@@ -30,6 +30,7 @@
3030
<UseApplicationTrust>false</UseApplicationTrust>
3131
<PublishWizardCompleted>true</PublishWizardCompleted>
3232
<BootstrapperEnabled>true</BootstrapperEnabled>
33+
<TargetFrameworkProfile />
3334
</PropertyGroup>
3435
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3536
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -62,6 +63,9 @@
6263
<PropertyGroup>
6364
<SignManifests>true</SignManifests>
6465
</PropertyGroup>
66+
<PropertyGroup>
67+
<ApplicationIcon>icon.ico</ApplicationIcon>
68+
</PropertyGroup>
6569
<ItemGroup>
6670
<Reference Include="Microsoft.Multipoint.Sdk, Version=1.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6771
<SpecificVersion>False</SpecificVersion>
@@ -83,6 +87,10 @@
8387
<Reference Include="System.Xaml">
8488
<RequiredTargetFramework>4.0</RequiredTargetFramework>
8589
</Reference>
90+
<Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
91+
<HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
92+
<Private>True</Private>
93+
</Reference>
8694
<Reference Include="WindowsBase" />
8795
<Reference Include="PresentationCore" />
8896
<Reference Include="PresentationFramework" />
@@ -97,6 +105,7 @@
97105
<Compile Include="src\FontStore.cs" />
98106
<Compile Include="src\GridUtil.cs" />
99107
<Compile Include="src\MainPageUtil.cs" />
108+
<Compile Include="src\Server.cs" />
100109
<Compile Include="src\TeamData.cs" />
101110
<Compile Include="src\Util.cs" />
102111
<Page Include="src\GameWindow.xaml">
@@ -138,6 +147,7 @@
138147
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
139148
</EmbeddedResource>
140149
<Resource Include="fonts\Arvo-Regular.ttf" />
150+
<None Include="packages.config" />
141151
<None Include="Properties\Settings.settings">
142152
<Generator>SettingsSingleFileGenerator</Generator>
143153
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -164,8 +174,11 @@
164174
<Resource Include="img\blank_cursor.jpg" />
165175
</ItemGroup>
166176
<ItemGroup>
167-
<Content Include="lib\Microsoft.Multipoint.Sdk.Controls.dll" />
168-
<Content Include="lib\Microsoft.Multipoint.Sdk.dll" />
177+
<None Include="img\default_cursor.png" />
178+
<Resource Include="icon.ico" />
179+
<None Include="img\icon.ico" />
180+
<None Include="lib\Microsoft.Multipoint.Sdk.Controls.dll" />
181+
<None Include="lib\Microsoft.Multipoint.Sdk.dll" />
169182
</ItemGroup>
170183
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
171184
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Binary file not shown.
Binary file not shown.

Quiz-o-matic 9000/bin/Debug/Quiz-o-matic 9000 v2.application

-21
This file was deleted.
Binary file not shown.

Quiz-o-matic 9000/bin/Debug/Quiz-o-matic 9000 v2.exe.config

-6
This file was deleted.

Quiz-o-matic 9000/bin/Debug/Quiz-o-matic 9000 v2.exe.manifest

-107
This file was deleted.
Binary file not shown.
Binary file not shown.

Quiz-o-matic 9000/bin/Debug/Quiz-o-matic 9000 v2.vshost.exe.config

-6
This file was deleted.

Quiz-o-matic 9000/bin/Debug/Quiz-o-matic 9000 v2.vshost.exe.manifest

-11
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)