v1.1

punlife · Dec 4, 2021 · b34a951 · b34a951
1 parent ff21de2
commit b34a951
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 35 deletions.
diff --git a/Punduction/Changelogs/v1_1.changelog b/Punduction/Changelogs/v1_1.changelog
@@ -0,0 +1,77 @@
+{
+	"Date": "01/11/2021",
+	"Version": "1.1",
+	"Items": 
+	[
+		{
+			"Title": "Big boi feature",
+			"Description": "Can now create overlays of Top4/8/16 brackets of different stages of bracket from SmashGG",
+			"Type": "Feature"
+		},
+		{
+			"Title": "Mistakes happen",
+			"Description": "Can now reset the scoreboard",
+			"Type": "Feature"
+		},
+		{
+			"Title": "Defaults are great",
+			"Description": "You can now set default providers, output types and stream name",
+			"Type": "Feature"
+		},
+		{
+			"Title": "Player pronouns",
+			"Description": "Punduction now automatically pulls player pronouns from SmashGG (filtering via whitelist from database available too)",
+			"Type": "Feature"
+		},
+		{
+			"Title": "Too lazy to save",
+			"Description": "Settings for auto-saving are now available (only auto-saves scoreboard, disabled by default)",
+			"Type": "Feature"
+		},
+		{
+			"Title": "Custom fields",
+			"Description": "There are now 4 custom fields available to be set (both property and value it corresponds to)",
+			"Type": "Feature"
+		},
+		{
+			"Title": "Got it memorised?",
+			"Description": "Going between tabs now keeps the tournament loaded",
+			"Type": "Enhancement"
+		},
+		{
+			"Title": "The more the better",
+			"Description": "Recent placements now average over a higher amount of results",
+			"Type": "Enhancement"
+		},
+		{
+			"Title": "PNGs aren't enough",
+			"Description": "Character art is no longer limited to .PNG filetype (any filetype will be picked up)",
+			"Type": "Enhancement"
+		},
+		{
+			"Title": "Character art custom path",
+			"Description": "Can now set where to look for character art",
+			"Type": "Enhancement"
+		},
+		{
+			"Title": "API Keys in Settings",
+			"Description": "Can now set/change API keys within the app",
+			"Type": "Enhancement"
+		},
+		{
+			"Title": "Loading bugs",
+			"Description": "Fixed some bugs related to loading certain URLs from SmashGG and Challonge ",
+			"Type": "Bug"
+		},
+		{
+			"Title": "Fixed issue with Settings saving",
+			"Description": "Settings in memory now correctly update on apply on top of saving to disk",
+			"Type": "Bug"
+		},
+		{
+			"Title": "Fixed XBOX connectivity in SmashGG",
+			"Description": "Fixed the issue and added some defensive code for any future occurences of similar bugs",
+			"Type": "Bug"
+		}
+	]
+}
diff --git a/Punduction/PunductionLibrary.pdb b/Punduction/PunductionLibrary.pdb
diff --git a/Punduction/PunductionRepository.db b/Punduction/PunductionRepository.db
diff --git a/Punduction/PunductionUI.exe b/Punduction/PunductionUI.exe
diff --git a/Punduction/PunductionUI.pdb b/Punduction/PunductionUI.pdb
diff --git a/Punduction/overlays/example_js_script_for_html_overlay_population.js b/Punduction/overlays/example_js_script_for_html_overlay_population.js
@@ -26,6 +26,7 @@ function processJson(jsonRequest) {
   var p1image="", p2image="";
   var p1twitter= "", p2twitter= "";
   var p1twitch= "", p2twitch= "";
+  var p1Pronouns= "", p2Pronouns= "";
   var caster1="", caster2="", caster3="", caster4="";
   var casterTwitter1="", casterTwitter2="", casterTwitter3="", casterTwitter4="";
   var round="", bestof="";
@@ -45,6 +46,7 @@ function processJson(jsonRequest) {
   p1image = "background-image: url(" + characterImagePath + json["player1"]["image"] + ");";  
   p1twitter = json["player1"]["twitter"];
   p1twitch = json["player1"]["twitch"];
+  p1Pronouns = json["player1"]["pronouns"];
 
   //RecentPlacementPlayer1
   p1averagePlacement = json["placement1"]["AveragePlacement"];
@@ -63,6 +65,8 @@ function processJson(jsonRequest) {
   p2image = "background-image: url(" + characterImagePath + json["player2"]["image"] + ");";  
   p2twitter = json["player2"]["twitter"];
   p2twitch = json["player2"]["twitch"];
+  p2Pronouns = json["player2"]["pronouns"];
+
   //RecentPlacementPlayer2
   p2averagePlacement = json["placement2"]["AveragePlacement"];
   p2placement1 = json["placement2"]["RecentPlacement1"];
@@ -148,41 +152,55 @@ function processJson(jsonRequest) {
       document.getElementById("p1logo").src = p1logo;
       document.getElementById("p2logo").src = p2logo;
       break;
-	case 11:
-	  document.getElementById("player1").innerHTML = player1;
+    case 11:
+      document.getElementById("player1").innerHTML = player1;
       document.getElementById("player2").innerHTML = player2;
-	  document.getElementById("p1team").innerHTML = p1team;
-	  document.getElementById("p2team").innerHTML = p2team;
-	  document.getElementById("p1twitter").innerHTML = p1twitter;
+      document.getElementById("p1team").innerHTML = p1team;
+      document.getElementById("p2team").innerHTML = p2team;
+      document.getElementById("p1twitter").innerHTML = p1twitter;
       document.getElementById("p2twitter").innerHTML = p2twitter;
-	  document.getElementById("p1twitch").innerHTML = p1twitch;
+      document.getElementById("p1twitch").innerHTML = p1twitch;
       document.getElementById("p2twitch").innerHTML = p2twitch;
-	  document.getElementById("p1image").style = p1image; 
+      document.getElementById("p1image").style = p1image; 
       document.getElementById("p2image").style = p2image; 
-	  document.getElementById("p1averagePlacement").innerHTML = p1averagePlacement;
-	  document.getElementById("p2averagePlacement").innerHTML = p2averagePlacement;  
-	  document.getElementById("p1placement1").innerHTML = p1placement1;
-	  document.getElementById("p1placement2").innerHTML = p1placement2;  
-	  document.getElementById("p1placement3").innerHTML = p1placement3;
-	  document.getElementById("p1placement4").innerHTML = p1placement4; 
-	  document.getElementById("p1placement5").innerHTML = p1placement5; 
-	  document.getElementById("p2placement1").innerHTML = p2placement1;
-	  document.getElementById("p2placement2").innerHTML = p2placement2;  
-	  document.getElementById("p2placement3").innerHTML = p2placement3;
-	  document.getElementById("p2placement4").innerHTML = p2placement4; 
-	  document.getElementById("p2placement5").innerHTML = p2placement5; 
-	  document.getElementById("p2placement4").innerHTML = p2placement4; 
-	  document.getElementById("p2placement5").innerHTML = p2placement5; 
-	  document.getElementById("p1SetWins").innerHTML = p1SetWins; 
-	  document.getElementById("p2SetWins").innerHTML = p2SetWins; 
-	  document.getElementById("h2hP1SetWinRate").innerHTML = h2hP1SetWinRate; 
-	  document.getElementById("h2hP2SetWinRate").innerHTML = h2hP2SetWinRate; 
-	  break;
+      document.getElementById("p1averagePlacement").innerHTML = p1averagePlacement;
+      document.getElementById("p2averagePlacement").innerHTML = p2averagePlacement;  
+      document.getElementById("p1placement1").innerHTML = p1placement1;
+      document.getElementById("p1placement2").innerHTML = p1placement2;  
+      document.getElementById("p1placement3").innerHTML = p1placement3;
+      document.getElementById("p1placement4").innerHTML = p1placement4; 
+      document.getElementById("p1placement5").innerHTML = p1placement5; 
+      document.getElementById("p2placement1").innerHTML = p2placement1;
+      document.getElementById("p2placement2").innerHTML = p2placement2;  
+      document.getElementById("p2placement3").innerHTML = p2placement3;
+      document.getElementById("p2placement4").innerHTML = p2placement4; 
+      document.getElementById("p2placement5").innerHTML = p2placement5; 
+      document.getElementById("p2placement4").innerHTML = p2placement4; 
+      document.getElementById("p2placement5").innerHTML = p2placement5; 
+      document.getElementById("p1SetWins").innerHTML = p1SetWins; 
+      document.getElementById("p2SetWins").innerHTML = p2SetWins; 
+      document.getElementById("h2hP1SetWinRate").innerHTML = h2hP1SetWinRate; 
+      document.getElementById("h2hP2SetWinRate").innerHTML = h2hP2SetWinRate; 
+    break;
 	case 12:
 	  document.getElementById("player1").innerHTML = player1;
       document.getElementById("player2").innerHTML = player2;
 	  break;
+  case 13:
+      document.getElementById("player1").innerHTML = player1;
+      document.getElementById("player2").innerHTML = player2;
+      document.getElementById("p1team").innerHTML = p1team;
+      document.getElementById("p2team").innerHTML = p2team;
+      document.getElementById("p1country").style = p1country;
+      document.getElementById("p2country").style = p2country;
+      document.getElementById("p1score").innerHTML = p1score;
+      document.getElementById("p2score").innerHTML = p2score;
+      document.getElementById("p1logo").src = p1logo;
+      document.getElementById("p2logo").src = p2logo;
+      document.getElementById("p1pronouns").innerHTML = p1Pronouns;
+      document.getElementById("p2pronouns").innerHTML = p2Pronouns;
+    break;
 	default:
-      break;
+    break;
   }
 }
diff --git a/README.md b/README.md
@@ -45,15 +45,8 @@ Make sure you download the prerequisites provided on the release page of the Pun
 
 ### Written instructions
 
-1. Navigate to api_keys.data file and add the API keys you have generated previously within the empty speech marks for the relevant services you will be using (if you only plan to use Challonge you don't need a SmashGG key etc.)
+1. Add your API keys to the application through the "Settings" tab and save your options
 
-2. Start the application using PunductionUI.exe
-
-
-
-### Video instructions
-
-https://youtu.be/CJtmCqIRaWw
 
 -----------------------------
 
@@ -115,6 +108,8 @@ In the v1.0, Punduction doesn't have a native way of editing its own internal da
 - Ctrl + D  - **Swap players**
 - Ctrl + 1 (Number row)  - **Increment player 1 score**
 - Ctrl + 2 (Number row)  - **Increment player 2 score**
+- Ctrl + Shift + 1 (Number row)  - **Decrement player 1 score**
+- Ctrl + Shift + 2 (Number row)  - **Decrement player 2 score**
 
 Any of these shortcuts can be changed in the **Settings** tab. Please do pay attention not to use Shift and any other key as a combination, but you can use Shift+Another modifier (Ctrl/Alt) + Letter/Number/Key without issues. If you do end up using shift Windows throws out an exception and kills the application (you can reset the settings if you do gets stuck with this problem by deleting the settings file itself which is found within the **Settings** folder).