From 867eabd6b7effc8ba6c21d7fcbd0480b14f81ad0 Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Sun, 6 Aug 2017 22:54:19 +0300
Subject: HID: use MotionDevice for Accelerometer and Gyroscope

---
 src/core/settings.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index ee16bb90a..7e15b119b 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -79,6 +79,7 @@ struct Values {
     // Controls
     std::array<std::string, NativeButton::NumButtons> buttons;
     std::array<std::string, NativeAnalog::NumAnalogs> analogs;
+    std::string motion_device;
 
     // Core
     bool use_cpu_jit;
-- 
cgit v1.2.3


From c84e60b4700778db236d3177714a076c515f9ce7 Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Tue, 8 Aug 2017 21:34:17 +0300
Subject: HID: use TouchDevice for touch pad

---
 src/core/settings.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index 7e15b119b..088d7651a 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -80,6 +80,7 @@ struct Values {
     std::array<std::string, NativeButton::NumButtons> buttons;
     std::array<std::string, NativeAnalog::NumAnalogs> analogs;
     std::string motion_device;
+    std::string touch_device;
 
     // Core
     bool use_cpu_jit;
-- 
cgit v1.2.3


From 3cdf854e44e7ff088fa0cbdcfa2bcc6e41822b2c Mon Sep 17 00:00:00 2001
From: ThaMighty90 <30285364+ThaMighty90@users.noreply.github.com>
Date: Fri, 25 Aug 2017 23:53:07 +0200
Subject: SidebySide Layout (#2859)

* added a SidebySide Layout

* Reworked, so both screen have the same height and cleaned up screen translates.

* added the option in the UI, hope this is the right way to do it. formated framebuffer_layout.cpp

* delete the x64 files

* deleted ui_configure_graphics.h

* added Option for the Layout in the xml

* got rid of SIDE_BY_SIDE_ASPECT_RATIO because it was useless. pulled translate into variables

* changed shift variables to u32 and moved them in their respective branch. remove notr="true" for the Screen layout drop down

* reworked intends :). changed function description for SideFrameLayout

* some description reworking
---
 src/core/settings.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index 7e15b119b..ca657719a 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -15,6 +15,7 @@ enum class LayoutOption {
     Default,
     SingleScreen,
     LargeScreen,
+    SideScreen,
 };
 
 namespace NativeButton {
@@ -70,7 +71,7 @@ enum Values {
 static const std::array<const char*, NumAnalogs> mapping = {{
     "circle_pad", "c_stick",
 }};
-} // namespace NumAnalog
+} // namespace NativeAnalog
 
 struct Values {
     // CheckNew3DS
@@ -137,4 +138,4 @@ struct Values {
 static constexpr int REGION_VALUE_AUTO_SELECT = -1;
 
 void Apply();
-}
+} // namespace Settings
-- 
cgit v1.2.3


From c781aea947e275a970a3431a36160b769865993d Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 22 Aug 2017 22:37:03 -0400
Subject: settings: Add enable_telemetry, citra_username, and citra_token.

---
 src/core/settings.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index ca657719a..bf8014c5a 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -130,7 +130,10 @@ struct Values {
     u16 gdbstub_port;
 
     // WebService
+    bool enable_telemetry;
     std::string telemetry_endpoint_url;
+    std::string citra_username;
+    std::string citra_token;
 } extern values;
 
 // a special value for Values::region_value indicating that citra will automatically select a region
-- 
cgit v1.2.3


From 28c726f20545744a3052a3e8a0a3bf5ff95a5042 Mon Sep 17 00:00:00 2001
From: B3n30 <bene_thomas@web.de>
Date: Tue, 19 Sep 2017 03:18:26 +0200
Subject: WebService: Verify username and token (#2930)

* WebService: Verify username and token; Log errors in PostJson

* Fixup: added docstrings to the functions

* Webservice: Added Icons to the verification, imrpved error detection in cpr, fixup nits

* fixup: fmt warning
---
 src/core/settings.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index 024f14666..8d78cb424 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -133,6 +133,7 @@ struct Values {
     // WebService
     bool enable_telemetry;
     std::string telemetry_endpoint_url;
+    std::string verify_endpoint_url;
     std::string citra_username;
     std::string citra_token;
 } extern values;
-- 
cgit v1.2.3