From ccff5afc95c2b0bea290c457b48a8ba69c4fcde1 Mon Sep 17 00:00:00 2001 From: SunTheCourier Date: Sun, 24 Jun 2018 14:21:44 -0700 Subject: [PATCH 1/7] pre-configure --- config.ini | 19 +++++++++---------- icons.txt | 10 ++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 icons.txt diff --git a/config.ini b/config.ini index 7af93fe..507ee95 100644 --- a/config.ini +++ b/config.ini @@ -12,22 +12,21 @@ ;# Optional Settings: SmallImage, LargeImageTooltip, SmallImageTooltip, # ;# StartTimestamp, EndTimestamp # ;# *ALL OTHERS ARE REQUIRED* # -;# # +;# # ;# https://github.com/Pizzabelly/EasyRP # ;######################################################################## [Identifiers] -ClientID=123456789012345678 +ClientID=389121925953355804 [State] -State= -Details= -StartTimestamp= -EndTimestamp= +State=set text here +Details=set text here + [Images] -LargeImage= -SmallImage= -LargeImageTooltip= -SmallImageTooltip= +LargeImage=unknow +SmallImage=unknow +LargeImageTooltip=set text here +SmallImageTooltip=set text here diff --git a/icons.txt b/icons.txt new file mode 100644 index 0000000..6854ba2 --- /dev/null +++ b/icons.txt @@ -0,0 +1,10 @@ +fest= Splatfest , Small Icon +unknow= Grizzco question mark , Small Icon +turf= Turf Wars , Small Icon +priv= Private Battle, Small Icon +rank= Ranked Battles, Small Icon +salmon= Salmon Run, Small Icon +league= League Battles, Small Icon +octo= Octo Expansion icon, Big Icon +splat= Splatoon 2 icon, Big Icon +SP= Single Player (Octo Canyon), Big Icon From 0a93518d0cfb7aab3ce44f2d032f40b3c7492b69 Mon Sep 17 00:00:00 2001 From: Sun <22406854+SunTheCourier@users.noreply.github.com> Date: Sun, 24 Jun 2018 16:43:16 -0700 Subject: [PATCH 2/7] Update config.ini --- config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.ini b/config.ini index 507ee95..6588f1e 100644 --- a/config.ini +++ b/config.ini @@ -18,7 +18,7 @@ [Identifiers] -ClientID=389121925953355804 +ClientID=460498031805071360 [State] State=set text here From 5860bc351d0f9bb3dc47c71e29ae0b049b18e62e Mon Sep 17 00:00:00 2001 From: SunTheCourier Date: Sun, 24 Jun 2018 19:34:42 -0700 Subject: [PATCH 3/7] more icons --- icons.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/icons.txt b/icons.txt index 6854ba2..9bde225 100644 --- a/icons.txt +++ b/icons.txt @@ -1,10 +1,15 @@ fest= Splatfest , Small Icon unknow= Grizzco question mark , Small Icon -turf= Turf Wars , Small Icon -priv= Private Battle, Small Icon -rank= Ranked Battles, Small Icon +turf= Turf Wars icon , Small Icon +priv= Private Battle icon, Small Icon +rank= Ranked Battles icon, Small Icon salmon= Salmon Run, Small Icon league= League Battles, Small Icon octo= Octo Expansion icon, Big Icon splat= Splatoon 2 icon, Big Icon SP= Single Player (Octo Canyon), Big Icon +clam= Clam Blitz Clam Mem Cake, Small Icon +rain= Rainmaker Mem Cake, Small icon +spawn= Spawn Point Mem Cake, Small Icon +turf_cake= Turf War icon Mem Cake, Small icon +tower= Tower Mem Cake, Small Icon From 2f4c748449e1aabf5bc83f4f602cd3c6668619b1 Mon Sep 17 00:00:00 2001 From: SunTheCourier Date: Sun, 1 Jul 2018 19:18:06 -0700 Subject: [PATCH 4/7] Revert "more icons" This reverts commit 5860bc351d0f9bb3dc47c71e29ae0b049b18e62e. --- icons.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/icons.txt b/icons.txt index 9bde225..6854ba2 100644 --- a/icons.txt +++ b/icons.txt @@ -1,15 +1,10 @@ fest= Splatfest , Small Icon unknow= Grizzco question mark , Small Icon -turf= Turf Wars icon , Small Icon -priv= Private Battle icon, Small Icon -rank= Ranked Battles icon, Small Icon +turf= Turf Wars , Small Icon +priv= Private Battle, Small Icon +rank= Ranked Battles, Small Icon salmon= Salmon Run, Small Icon league= League Battles, Small Icon octo= Octo Expansion icon, Big Icon splat= Splatoon 2 icon, Big Icon SP= Single Player (Octo Canyon), Big Icon -clam= Clam Blitz Clam Mem Cake, Small Icon -rain= Rainmaker Mem Cake, Small icon -spawn= Spawn Point Mem Cake, Small Icon -turf_cake= Turf War icon Mem Cake, Small icon -tower= Tower Mem Cake, Small Icon From a4fdce6efd5cd2077e4e8faa697915990474f4c9 Mon Sep 17 00:00:00 2001 From: SunTheCourier Date: Sun, 1 Jul 2018 19:18:08 -0700 Subject: [PATCH 5/7] Revert "Update config.ini" This reverts commit 0a93518d0cfb7aab3ce44f2d032f40b3c7492b69. --- config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.ini b/config.ini index 6588f1e..507ee95 100644 --- a/config.ini +++ b/config.ini @@ -18,7 +18,7 @@ [Identifiers] -ClientID=460498031805071360 +ClientID=389121925953355804 [State] State=set text here From 7cbd1a215c55207a008b37beb4af1fb3d57b9d26 Mon Sep 17 00:00:00 2001 From: SunTheCourier Date: Sun, 1 Jul 2018 19:18:10 -0700 Subject: [PATCH 6/7] Revert "pre-configure" This reverts commit ccff5afc95c2b0bea290c457b48a8ba69c4fcde1. --- config.ini | 19 ++++++++++--------- icons.txt | 10 ---------- 2 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 icons.txt diff --git a/config.ini b/config.ini index 507ee95..7af93fe 100644 --- a/config.ini +++ b/config.ini @@ -12,21 +12,22 @@ ;# Optional Settings: SmallImage, LargeImageTooltip, SmallImageTooltip, # ;# StartTimestamp, EndTimestamp # ;# *ALL OTHERS ARE REQUIRED* # -;# # +;# # ;# https://github.com/Pizzabelly/EasyRP # ;######################################################################## [Identifiers] -ClientID=389121925953355804 +ClientID=123456789012345678 [State] -State=set text here -Details=set text here - +State= +Details= +StartTimestamp= +EndTimestamp= [Images] -LargeImage=unknow -SmallImage=unknow -LargeImageTooltip=set text here -SmallImageTooltip=set text here +LargeImage= +SmallImage= +LargeImageTooltip= +SmallImageTooltip= diff --git a/icons.txt b/icons.txt deleted file mode 100644 index 6854ba2..0000000 --- a/icons.txt +++ /dev/null @@ -1,10 +0,0 @@ -fest= Splatfest , Small Icon -unknow= Grizzco question mark , Small Icon -turf= Turf Wars , Small Icon -priv= Private Battle, Small Icon -rank= Ranked Battles, Small Icon -salmon= Salmon Run, Small Icon -league= League Battles, Small Icon -octo= Octo Expansion icon, Big Icon -splat= Splatoon 2 icon, Big Icon -SP= Single Player (Octo Canyon), Big Icon From 464a7b5cc0d89f1b4c3e4b62bede0c302da2d537 Mon Sep 17 00:00:00 2001 From: SunTheCourier Date: Sun, 1 Jul 2018 19:22:15 -0700 Subject: [PATCH 7/7] fix build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 946a49b..163af39 100644 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ read -p "Press any key to continue building..." echo "Building discord-rpc from its source" git clone https://github.com/discordapp/discord-rpc.git discord-rpc cd discord-rpc -mkidr -p build && cd build +mkdir -p build && cd build cmake .. -DCMAKE_BUILD_TYPE=Release make