This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import falcon | |
class TestResponse(): | |
def on_get(self, req, resp): | |
resp.body = "Success" | |
resp.content_type = falcon.MEDIA_TEXT | |
application = falcon.API() | |
# http://localhost/item/19/01/01/Item-190101-59559ee7-e661-43c8-9da1-0ab83b9e0d8e.json | |
application.add_route("/item/{y:int}/{m:int}/{d:int}/Item-{yymmdd:int}-{item_id:uuid}.json", TestResponse()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/rpcs3/Emu/RSX/RSXThread.cpp | |
+++ b/rpcs3/Emu/RSX/RSXThread.cpp | |
@@ -25,6 +25,7 @@ cfg::bool_entry g_cfg_rsx_read_color_buffers(cfg::root.video, "Read Color Buffer | |
cfg::bool_entry g_cfg_rsx_read_depth_buffer(cfg::root.video, "Read Depth Buffer"); | |
cfg::bool_entry g_cfg_rsx_log_programs(cfg::root.video, "Log shader programs"); | |
cfg::bool_entry g_cfg_rsx_vsync(cfg::root.video, "VSync"); | |
+cfg::bool_entry g_cfg_rsx_start_fullscreen(cfg::root.video, "Start Fullscreen"); | |
cfg::bool_entry g_cfg_rsx_debug_output(cfg::root.video, "Debug output"); | |
cfg::bool_entry g_cfg_rsx_overlay(cfg::root.video, "Debug overlay"); | |
cfg::bool_entry g_cfg_rsx_gl_legacy_buffers(cfg::root.video, "Use Legacy OpenGL Buffers (Debug)"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp | |
index 765a682..ec57471 100644 | |
--- a/rpcs3/Gui/GameViewer.cpp | |
+++ b/rpcs3/Gui/GameViewer.cpp | |
@@ -69,10 +69,12 @@ void GameViewer::InitPopupMenu() | |
m_popup->Append(boot_item); | |
m_popup->Append(1, _T("Configure")); | |
m_popup->Append(2, _T("Remove Game")); | |
+ m_popup->Append(3, _T("Remove Custom Configuration")); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/eve-core/eve-compat.h b/src/eve-core/eve-compat.h | |
index 73426be..16d5522 100644 | |
--- a/src/eve-core/eve-compat.h | |
+++ b/src/eve-core/eve-compat.h | |
@@ -179,9 +179,9 @@ typedef int SOCKET; | |
#endif /* !HAVE_FINITE */ | |
#ifndef HAVE_ISNAN | |
-# if defined( HAVE_STD_ISNAN ) | |
-# define isnan std::isnan |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/eve-common/marshal/EVEMarshalStringTable.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-common/marshal/EVEMarshalStringTable.cpp (date 1469126431000) | |
+++ src/eve-common/marshal/EVEMarshalStringTable.cpp (revision ) | |
@@ -27,7 +27,15 @@ | |
#include "marshal/EVEMarshalStringTable.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/eve-common/python/PyRep.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-common/python/PyRep.cpp (revision 9499ec6bdb7f03ac3e02a99431d2397a749c7b54) | |
+++ src/eve-common/python/PyRep.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -1177,6 +1177,16 @@ | |
} | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/eve-server/Client.cpp b/src/eve-server/Client.cpp | |
index c5098a0..eedb89e 100644 | |
--- a/src/eve-server/Client.cpp | |
+++ b/src/eve-server/Client.cpp | |
@@ -767,8 +767,7 @@ void Client::_SendSessionChange() | |
SessionChangeNotification scn; | |
scn.changes = new PyDict; | |
- // TO-DO: This should be a unique value for each login. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gns3/items/node_item.py b/gns3/items/node_item.py | |
index 128f6fc..a7a64b6 100644 | |
--- a/gns3/items/node_item.py | |
+++ b/gns3/items/node_item.py | |
@@ -380,7 +380,9 @@ class NodeItem(): | |
# was causing infinite recursion loops when placed within the below if statements | |
if change == QtWidgets.QGraphicsItem.ItemPositionHasChanged and self._main_window.uiSnapToGridAction.isChecked(): | |
GRID_SIZE = 75 | |
- self.setPos(float(GRID_SIZE * round(self.x() / GRID_SIZE)), float(GRID_SIZE * round(self.y() / GRID_SIZE))) | |
+ tmp_x = (GRID_SIZE * round(self.x() / GRID_SIZE)) - ((self.boundingRect().width() / 2) % GRID_SIZE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gns3/ui/main_window_ui.py b/gns3/ui/main_window_ui.py | |
index 51cdc73..9105caa 100644 | |
--- a/gns3/ui/main_window_ui.py | |
+++ b/gns3/ui/main_window_ui.py | |
@@ -1,9 +1,8 @@ | |
# -*- coding: utf-8 -*- | |
-# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/main_window.ui' | |
+# Form implementation generated from reading ui file '/home/cometo/dev/gns3-gui/gns3/ui/main_window.ui' | |
# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gns3/items/node_item.py b/gns3/items/node_item.py | |
index c6c7be3..2fa0aef 100644 | |
--- a/gns3/items/node_item.py | |
+++ b/gns3/items/node_item.py | |
@@ -377,6 +377,10 @@ class NodeItem(): | |
:param value: value of the change | |
""" | |
+ if change == 9: # Unsure but seems to alternate between 0/9 while dragging | |
+ GRID_SIZE = 75 |
NewerOlder