Skip to content

Merge pull request #187 from LEAGUE-Level6/feature/MASH #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabreb wants to merge 75 commits into
base: feature/MASH
Choose a base branch
from
Open

Merge pull request #187 from LEAGUE-Level6/feature/MASH #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
88c92f6
created new feature
codeavenger1 Dec 22, 2020
f7b24a7
Discord Bot
adrianolguin Dec 24, 2020
c5866c2
bot
adrianolguin Dec 31, 2020
1918f77
got api keys
codeavenger1 Jan 5, 2021
b7673d6
Started working on reminder feature, going well
adrianolguin Jan 7, 2021
2049be5
got api key
codeavenger1 Jan 12, 2021
ba785b4
Adrian's 2nd Feature
adrianolguin Jan 14, 2021
5389d87
test next class
codeavenger1 Jan 19, 2021
d771ab7
Merge branch 'development' into Adrian-Discord-Bot
adrianolguin Jan 28, 2021
27cfe0e
Third bot function
adrianolguin Jan 28, 2021
f1a9ed7
reminder
adrianolguin Jan 28, 2021
1a879fa
done
codeavenger1 Feb 9, 2021
4b4463b
done
codeavenger1 Feb 16, 2021
20dee6a
Refactoring yay
adrianolguin Feb 18, 2021
dd48567
Set up poker bot
j-mordan Feb 21, 2021
48431a2
Added commands
j-mordan Feb 21, 2021
99c07d8
Poll, percentages
adrianolguin Feb 25, 2021
f657d78
creating cards and logic
j-mordan Feb 27, 2021
cb9b48c
poll finished
adrianolguin Mar 11, 2021
ec631a3
Added logic to the bot for calling and folding. It needs to be debugged.
j-mordan Mar 13, 2021
dec1a1d
Added 4th card
j-mordan Mar 14, 2021
ff614e8
token
j-mordan Mar 14, 2021
3596626
Merge pull request #187 from LEAGUE-Level6/feature/MASH
adrianolguin Mar 18, 2021
2425f32
Fixing my branches :p
adrianolguin Mar 18, 2021
4314942
Fixing my branches
adrianolguin Mar 18, 2021
0d41f8b
Fixing my branches
adrianolguin Mar 18, 2021
9234a6c
Adding help embed to my feature
adrianolguin Mar 18, 2021
a345c27
oops
adrianolguin Mar 18, 2021
5d3cb0b
Adding Help Embed
adrianolguin Mar 21, 2021
02aeec0
poker is finished, only needs to check who is the winner
j-mordan Mar 21, 2021
5b5b85f
Finishing touches, finally done
adrianolguin Mar 25, 2021
c8cb467
done
adrianolguin Mar 25, 2021
5c5e450
Done
adrianolguin Mar 25, 2021
0126760
Merge branch 'development' into feature/Reminder
adrianolguin Mar 25, 2021
0efd4a0
Merge branch 'development' into feature/Hello
adrianolguin Mar 25, 2021
e6f263d
Merge branch 'development' into feature/Poll
adrianolguin Mar 25, 2021
7827f35
poker done, needs debugging
j-mordan Mar 28, 2021
830214c
token change
j-mordan Mar 28, 2021
24e871e
Bot is done, needs to fix negative number glitch
j-mordan Apr 11, 2021
acc4d06
token
j-mordan Apr 11, 2021
bca86dc
added river betting, needs negative number bug to be fixed
j-mordan Apr 18, 2021
ebcc36a
Finished the marsImage feature.
Drill-X Apr 20, 2021
3ccce81
added straight recognition
j-mordan Apr 25, 2021
3e59888
untested changed scoring with flushes now
j-mordan May 2, 2021
bacfcdf
token
j-mordan May 2, 2021
00223fc
full house done
j-mordan May 9, 2021
4adcab4
Everything done, in testing
j-mordan May 16, 2021
b551b44
Working on debugging
j-mordan May 23, 2021
558d6d5
Merge pull request #195 from LEAGUE-Level6/dexhaehnic/APIfeature
DaveDLeague May 28, 2021
76d7fa5
fixed bug that messed up scoring, needs testing
j-mordan May 30, 2021
6b9bb41
token
j-mordan May 30, 2021
bcd76a8
Poker bot completed
j-mordan Jun 6, 2021
072ada1
Poker bot completed
j-mordan Jun 6, 2021
fbe2ea8
Merge branch 'development' into Feature/JakeFeature2
lucas-khattar Jun 10, 2021
43e2c71
Merge pull request #203 from LEAGUE-Level6/Feature/JakeFeature2
lucas-khattar Jun 10, 2021
7e56707
Merge branch 'development' into feature/Poll
lucas-khattar Jun 10, 2021
53d7901
Merge pull request #190 from LEAGUE-Level6/feature/Poll
lucas-khattar Jun 10, 2021
85d569c
Merge branch 'development' into feature/Hello
Jun 17, 2021
697ce69
Merge pull request #189 from LEAGUE-Level6/feature/Hello
Jun 17, 2021
1ae414f
Merge branch 'development' into feature/Reminder
Jun 24, 2021
ee54891
Merge pull request #188 from LEAGUE-Level6/feature/Reminder
Jun 24, 2021
281a7fe
Merge branch 'development' into feature/film
Jun 24, 2021
9e7aafe
Merge pull request #184 from LEAGUE-Level6/feature/film
Jun 24, 2021
4d0ed9c
commit
surroundedxd Jan 11, 2022
057b645
Update PingPong.java
surroundedxd Jan 11, 2022
46403af
Created Random Number Feature
RoshanSood Jan 11, 2022
83ef7b7
Updated the first feature
RoshanSood Jan 18, 2022
e59be02
Merge pull request #211 from surroundedxd/feature1/surroundedxd
RoshanSood Jan 18, 2022
0de745b
Update config.json
surroundedxd Jan 18, 2022
c7d5546
Merge branch 'development' into Roshans-DiscordBot
surroundedxd Jan 18, 2022
464c3c9
Merge pull request #213 from LEAGUE-Level6/Roshans-DiscordBot
ColbySchexnayder Jan 18, 2022
82a3413
Finished Second Feature
RoshanSood Jan 18, 2022
1836a2e
Finished Second Feature
RoshanSood Jan 25, 2022
f4ce6b6
Finished Final Feature on the Discord Bot
RoshanSood Jan 25, 2022
b6b7d38
Merge pull request #214 from LEAGUE-Level6/Roshans-DiscordBot
surroundedxd Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ target/

src/main/resources/config.json
src/main/resources/config.json
src/main/resources/config.json
src/main/resources/config.json
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading