Commit Graph
311 Commits
Author SHA1 Message Date
Alex 46cf6f8c97 Bug Fixes with Music playing 2019-12-18 03:07:52 -05:00
Rin a63afd3a2b Merge remote-tracking branch 'origin/develop' into develop 2019-12-16 01:50:18 -05:00
Matthew Cech d15336f4b6 Merge remote-tracking branch 'origin/develop' into develop 2019-11-02 19:32:51 -08:00
Matthew Cech d63a531a81 Merge branch 'feature/cleanup' into develop 2019-11-02 19:32:12 -08:00
Matthew Cech c8af9da196 Merge remote-tracking branch 'origin/feature/cleanup' into feature/cleanup 2019-11-02 19:31:45 -08:00
Matthew Cech 595b1e3958 = clarified mode with note in key 2019-11-02 19:31:39 -08:00
Matthew Cech d6fd5ae436 = clarified mode with note in key 2019-11-02 19:31:02 -08:00
Matthew Cech 74a5750824 = Updated config 2019-11-02 19:29:02 -08:00
Matthew Cech 7f2251732e = Configs updating 2019-11-02 19:13:26 -08:00
Matthew Cech ee60721897 Merge branch 'master' into feature/cleanup 2019-11-02 11:00:40 -07:00
Alex 6e7b6fce29 Merge branch 'hotfix/slowmerge' into develop 2019-10-19 03:37:06 -04:00
Alex 55487a017e =Bug fixes 2019-10-19 03:36:52 -04:00
Alex c7ed9785dc Merge branch 'hotfix/slowmerge' into develop 2019-10-19 03:35:52 -04:00
Alex 7b179b10ee =Music bug fixes
-Playlist not loading correctly
2019-10-19 03:35:43 -04:00
Alex bd1bcc1bd3 =Bug fix 2019-10-19 02:59:18 -04:00
Alex 462bb58ead =Fixing Youtube Player 2019-10-19 02:56:11 -04:00
Alex 6a84f3759a =Updates 2019-10-18 03:11:01 -04:00
Matthew Cech dfbf646abc = synced item tweak 2019-10-18 00:08:23 -07:00
Matthew Cech 12e0ec98bd = Swapped to sync object 2019-10-18 00:04:38 -07:00
Matthew Cech 0ff71abfb0 = Player isolation 2019-10-18 00:00:39 -07:00
Matthew Cech 94a3f1afcd = Condensed track scheduler 2019-10-17 23:37:44 -07:00
Matthew Cech 4d36bb0cb9 = Condensed managers and handler 2019-10-17 23:33:14 -07:00
Matthew Cech 248814b9e3 = Condense, iterative 2019-10-17 23:31:06 -07:00
Matthew Cech a1fa8b29b2 = Condensed main shapsnot 2019-10-17 23:22:29 -07:00
Matthew Cech 4ed18b8acc = main migrate 2019-10-17 22:55:49 -07:00
Matthew Cech afb27df33d gitflow-hotfix-stash: slowmerge 2019-10-17 22:39:56 -07:00
Alex 8cfa25a51b =Synchronized response String 2019-10-18 00:39:33 -04:00
Alex bbbb138f5e =Work on Music command 2019-10-18 00:36:20 -04:00
Alex 343308c433 Merge remote-tracking branch 'origin/master' 2019-10-13 23:23:53 -04:00
Rin 52fdaefe75 =Music updates and image sourcing 2019-10-13 23:23:44 -04:00
Matthew Cech b960fd0101 + Added ability to change bet threshold from config file 2019-09-12 22:48:24 -07:00
Matthew Cech 44efcef7ae = Covered leaderboard to prevent bad parses and condensed command manager 2019-09-12 22:24:38 -07:00
Matthew Cech a73fca7851 Merge branch 'hotfix/dance' 2019-09-12 22:15:34 -07:00
Matthew Cech f49711b739 Merge branch 'hotfix/dance' into develop 2019-09-12 22:15:34 -07:00
Matthew Cech ed6e8da2d8 = Fixed errors in dance 2019-09-12 22:14:59 -07:00
Matthew Cech bb67f72b98 + Added dance 2019-09-12 22:14:59 -07:00
Matthew Cech ef3c29a99d - Removed unfinished RPG command 2019-09-08 19:45:43 -07:00
Alex c29fb1dd1f =Fixed role case issue 2019-08-13 16:11:35 -04:00
Alex 5972408627 Merge branch 'develop' 2019-08-09 23:24:01 -04:00
Alex f3448fdc89 Merge remote-tracking branch 'origin/develop' into develop 2019-08-09 23:23:47 -04:00
Alex 2c486d7da1 =Config file bug fixes 2019-08-09 23:23:43 -04:00
Matthew Cech 81d56bec6a Merge remote-tracking branch 'origin/develop' into develop 2019-08-07 20:47:31 -07:00
Matthew Cech 31c5727d13 + Added fix for leader-board attempting to display non-existing user 2019-08-07 20:47:15 -07:00
Alex Stewart 81d3bd13b0 Merge remote-tracking branch 'origin/develop' into develop 2019-07-30 16:44:23 -07:00
Alex Stewart cd7f24d530 =Bug Fixes 2019-07-30 16:44:16 -07:00
Alex Stewart dd828282d3 =Work on Music integration 2019-07-30 14:50:20 -07:00
Alex Stewart 74ebd38fe5 =Added LavaPlayer dependency
LavaPlayer dependency for audio importing and sending through discord
2019-07-30 01:55:21 -07:00
Alex Stewart a62c10d06e +Started music integration
Voice channel join/disconnect
2019-07-30 01:19:34 -07:00
Alex Stewart 9cc703ab63 =Bug Fixes 2019-07-28 15:18:08 -07:00
Alex Stewart 3af46e94da Auto stash before merge of "develop" and "master" 2019-07-27 23:34:37 -07:00