Commit Graph
243 Commits
Author SHA1 Message Date
null3000 4fdc1aeca3 Merge branch 'develop' into ux-changes 2022-06-08 22:50:01 +02:00
Callum Leslie 54c6518906 Merge pull request #171 from reoccurcat/master
allow a custom background to be used instead of the Minecraft parkour
2022-06-08 19:07:22 +01:00
Hayden 875b01e2e8 Merge branch 'develop' into master 2022-06-08 12:02:02 -05:00
null3000 2004f7c0a5 fixed merge errors 2022-06-08 17:25:31 +02:00
null3000 31a4e825f1 fixed merge issues 2022-06-08 17:22:19 +02:00
null3000 bfd98d1da9 Merge branch 'develop' into ux-changes 2022-06-08 17:18:34 +02:00
null3000 abbb496012 round video length
turns 'total_length' into an int, instead of float.
2022-06-08 17:16:35 +02:00
Callum Leslie 757477cee8 Merge pull request #333 from DomizianoScarcelli/change-video-location
Added a .env variable to change the save location of the final video
2022-06-07 23:29:10 +01:00
Domiziano Scarcelli cacf3764e2 Merge branch 'develop' into change-video-location 2022-06-08 00:26:11 +02:00
Domiziano Scarcelli e1b5a5a1a6 Merge branch 'master' of https://github.com/elebumm/RedditVideoMakerBot into change-video-location 2022-06-08 00:24:02 +02:00
Domiziano Scarcelli 5bf0888460 Removed unused imports 2022-06-08 00:23:29 +02:00
Callum Leslie a05a43f1de Merge pull request #261 from DomizianoScarcelli/filter-comments-by-length
Option to filter the comments by length (min and max number of characters)
2022-06-07 23:14:02 +01:00
Callum Leslie f058edf6a4 Merge pull request #360 from CordlessCoder/CordlessCoder--PATCHES
fixed image hyperlink
2022-06-07 23:11:08 +01:00
Callum Leslie 00ba8789f9 Merge pull request #368 from Phlipde/develop
Removed "Click to see nsfw" Button in Screenshot
2022-06-07 23:09:49 +01:00
Phlipde 50cca3183d Removed "Click to see nsfw" Button in Screenshot 2022-06-07 18:45:18 +02:00
CordlessCoder 914f8679ae merge conflict 2022-06-07 13:06:54 +03:00
CordlessCoder afd89a7ef8 merge conflict 2022-06-07 13:06:01 +03:00
CordlessCoder 2234a5c973 fixed image hyperlink 2022-06-07 13:03:29 +03:00
Domiziano Scarcelli a51a382b36 Merge branch 'develop' into filter-comments-by-length 2022-06-07 10:53:59 +02:00
null3000 5fb9b1a6c3 Added Disclaimer "Banner may look bad or wrong in IDE/Text Editor, but looks perfect in CMD, BASH or ZSH"
The banner may look bad or wrong in IDE/Text Editor but looks perfect in CMD, BASH, or ZSH. Don't worry looks great when in actual use!
2022-06-07 02:14:21 +02:00
null3000 224217f341 Merge branch 'develop' into ux-changes 2022-06-07 02:10:54 +02:00
null3000 c24234aa53 Update main.py 2022-06-07 01:53:19 +02:00
null3000 9b25603bba Update voices.py 2022-06-07 01:52:44 +02:00
null3000 bafe8c3616 Update screenshot_downloader.py 2022-06-07 01:52:21 +02:00
null3000 232b444251 Update final_video.py 2022-06-07 01:52:02 +02:00
null3000 eeeaff0a04 gives user thread stats 2022-06-07 01:50:30 +02:00
Callum Leslie 2ac69da449 Merge pull request #311 from null3000/null3000-tts-links
tts will no longer read aloud link
2022-06-06 22:59:20 +01:00
null3000 c302d8c2e5 fixed errors 2022-06-06 23:51:23 +02:00
null3000 2f61580af7 fixed error 2022-06-06 23:49:27 +02:00
null3000 76e52af6b2 fixed errors 2022-06-06 23:48:29 +02:00
null3000 62931a1b2a Merge branch 'master' into null3000-tts-links 2022-06-06 23:37:10 +02:00
null3000 be2870a24b Merge branch 'elebumm:master' into null3000-tts-links 2022-06-06 23:34:38 +02:00
Callum Leslie e4c5fb40b1 Add pylintrc 2022-06-06 22:33:03 +01:00
Callum Leslie 2e675193bf Move to more comprehensive gitignore 2022-06-06 22:14:39 +01:00
Callum Leslie 623b34f095 Merge pull request #345 from CordlessCoder/master
setup.py refactored, added shebang lines and formatted files with python-black
2022-06-06 22:06:10 +01:00
Callum Leslie fa2df235db Merge pull request #349 from elebumm/1.1
Move legacy branch into develop
2022-06-06 21:04:51 +01:00
Callum Leslie 0914a7858f Add correct playwright command 2022-06-06 21:04:42 +01:00
Callum Leslie cbcbf3756f Merge branch 'develop' into 1.1 2022-06-06 21:03:51 +01:00
Lewis Menelaws 41ebf3b5e5 Merge pull request #341 from BlockArchitech/patch-1
Add GPLv3
2022-06-06 15:48:30 -04:00
CordlessCoder 01c9977549 fixed the character bounds for client_ID 2022-06-06 21:35:10 +03:00
CordlessCoder 69c8b4a189 subreddit.py surface level refactor 2022-06-06 21:21:17 +03:00
CordlessCoder 24863a9940 video_creation surface level refactor 2022-06-06 21:20:08 +03:00
CordlessCoder d9bf0e509b main.py surface level refactor 2022-06-06 21:19:01 +03:00
CordlessCoder 42861287ef forgor to change shell back to true 💀 2022-06-06 21:10:21 +03:00
CordlessCoder 86c7b26f00 small regex fix 2022-06-06 21:07:33 +03:00
CordlessCoder 081e01c75d Merge branch 'master' of https://github.com/CordlessCoder/RedditVideoMakerBot 2022-06-06 20:52:52 +03:00
CordlessCoder c028d66b0c fixed run.sh 2022-06-06 20:52:41 +03:00
CordlessCoder d0dea99fcc Merge branch 'elebumm:master' into master 2022-06-06 20:44:50 +03:00
CordlessCoder 45a296db80 setup.py heavily refactored, all files formatted with python-BLACK and added shebang lines 2022-06-06 20:42:46 +03:00
null3000 e41ad649ee Update main.py 2022-06-06 19:16:57 +02:00