gerudo
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity
19,292 Commits
1 Branch
0 Tags
1.8 GiB
Commit Graph

548 Commits (d0d67085e3de41bda7650c644878d265b37554f8)

Author SHA1 Message Date
Aevann1 dbad75a53f sneed 2022-09-11 22:00:03 +00:00
Aevann1 f9dda990e1 sneed 2022-09-11 18:00:02 +00:00
Aevann1 a5dae68b12 sneed 2022-09-11 17:00:03 +00:00
Aevann1 d01dd203e1 sneed 2022-09-11 16:00:01 +00:00
Aevann1 c015c6ee48 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-11 14:39:10 +00:00
Aevann1 9253d8d8b4 sneed 2022-09-11 14:00:03 +00:00
Aevann1 6e60147435 update 2 marseys 2022-09-11 15:49:58 +02:00
Aevann1 40558765db cosmetic change 2022-09-11 11:41:52 +02:00
Aevann1 4bec67c15a small cosmetic change 2022-09-11 11:14:53 +02:00
Aevann1 8127af07ca update marseysipping 2022-09-11 09:35:21 +02:00
Aevann1 1cb41bfe1f groomercord screenshots dont belong on the sidebar 2022-09-11 06:03:11 +02:00
Aevann1 501abd8082 sneed 2022-09-11 03:00:03 +00:00
Aevann1 eb9f0e7605 remove duplicate sidebar img 2022-09-11 04:12:11 +02:00
Aevann1 4ab7fba8e0 sneed 2022-09-11 02:00:05 +00:00
Aevann1 4a128e5ab3 sneed 2022-09-11 01:00:02 +00:00
Aevann1 89ddac56b9 sneed 2022-09-11 00:00:02 +00:00
Aevann1 acf73d00ef sneed 2022-09-10 23:00:02 +00:00
Aevann1 c9b9a49cad sneed 2022-09-10 22:00:02 +00:00
Aevann1 af5d392fc0 sneed 2022-09-10 21:06:47 +00:00
outruncolors d57a569125
[DO NOT MERGE] Casino changes (#350) 
* Merge up

* Create composable template for casino games

* Big changerinos

* Only allow double down sometimes

* Add drawing capability

* Make everything pretty

* Add leaderboard

* Update files/routes/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Add some stuff

* Rehab screen

* Default sets for no games

* Stupid revert

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-10 16:01:34 -05:00
Aevann1 89a162c2f2 sneed 2022-09-10 21:00:02 +00:00
Aevann1 a90d710177 sneed 2022-09-10 20:00:01 +00:00
Aevann1 593aa416e9 sneed 2022-09-10 18:48:59 +00:00
Aevann1 571adad79a Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-10 18:48:34 +00:00
Snakes a0bd960b19
Add hat template link to submit_hats. 2022-09-10 14:45:10 -04:00
Aevann1 db08162dc1 sneed 2022-09-10 18:00:03 +00:00
Aevann1 3b81192f03 sneed 2022-09-10 17:00:02 +00:00
Aevann1 6815e3fddb sneed 2022-09-10 16:00:02 +00:00
Aevann1 87bcc958fa sneed 2022-09-10 15:00:03 +00:00
Aevann1 5338801eed sneed 2022-09-10 14:00:01 +00:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 8f0b2ea9c3 test on devrama 2022-09-10 11:31:51 +02:00
Aevann1 8b5b6a2429 fix sorting 2022-09-10 10:45:37 +02:00
Aevann1 b99cc4a8aa remove surgical tools I forgot in the patient's body 2022-09-10 10:42:17 +02:00
Aevann1 e7352bb1c6 remove a banner 2022-09-10 10:34:10 +02:00
Aevann1 1a6fbd1f29 sneed 2022-09-10 08:04:59 +00:00
Aevann1 da5742e0bc sneed 2022-09-10 08:04:54 +00:00
Aevann1 bbfdaf0dbe sneed 2022-09-10 08:04:50 +00:00
Aevann1 45f1b5050c sneed 2022-09-10 04:00:05 +00:00
Aevann1 e128d77722 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-10 03:53:38 +00:00
Aevann1 770e818d67 add telegram links 2022-09-10 05:52:56 +02:00
Aevann1 65b6c743b4 sneed 2022-09-10 03:00:02 +00:00
Aevann1 3a9441a582 sneed 2022-09-10 01:00:03 +00:00
Aevann1 9ad4dbeaa7 cosmetic change 2022-09-10 02:25:53 +02:00
Aevann1 36a4c7d7f4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-10 00:07:26 +00:00
Aevann1 41e18ee32d sneed 2022-09-10 00:00:02 +00:00
Aevann1 00b71e0bc5 restore the original emoji icon 2022-09-10 01:52:52 +02:00
Aevann1 acf6ca7d74 remove sidebar background (I hate it) 2022-09-09 11:28:59 +02:00
Aevann1 47890d771d add Marsey Submission UI 2022-09-09 11:13:50 +02:00
Aevann1 d75fcc4bdc cosmetic change 2022-09-09 08:50:59 +02:00
Aevann1 f17192e68b cosmetic change 2022-09-09 08:46:10 +02:00
Aevann1 2b467c7f77 remove 3 bad sidebar images 2022-09-09 08:41:06 +02:00
Aevann1 dcdf37b626 sneed 2022-09-09 00:00:02 +00:00
Aevann1 362e4e049c sneed 2022-09-08 22:00:02 +00:00
Aevann1 23338e8172 try to fix the wrong method error on giving awards 2022-09-08 21:21:41 +02:00
Aevann1 17fabb423a cosmetic fix 2022-09-08 19:32:02 +02:00
Aevann1 2ceeec26b7 cosmetic fix 2022-09-08 19:30:22 +02:00
Aevann1 e9445efc22 make bootstrap work on localhost 2022-09-08 19:12:46 +02:00
Aevann1 d22240160c testing on devrama 2022-09-08 18:46:45 +02:00
Aevann1 2c188f3055 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-08 16:11:56 +00:00
Aevann1 26535c4b25 cosmetic change 2022-09-08 18:11:44 +02:00
Aevann1 2038922513 cosmetic shit 2022-09-08 18:02:53 +02:00
Aevann1 128400d259 sneed 2022-09-08 16:00:02 +00:00
Aevann1 bc6827826a
Update main.css 2022-09-07 11:26:26 +02:00
Aevann1 62a2a4d632 same as last commit 2022-09-07 08:50:33 +02:00
Aevann1 be53d04d65 fix pp20 2022-09-07 08:41:08 +02:00
Aevann1 4760aed187 fix rainbow-text on drambler and 4chan themes, thanks hbtz 2022-09-07 06:53:50 +02:00
Aevann1 5363aa67c6 do this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2672411?context=8#context 2022-09-07 06:28:02 +02:00
Aevann1 9475aa27e4 award badges shit 2022-09-07 05:31:55 +02:00
Aevann1 d695755aa2 sneed 2022-09-07 03:00:02 +00:00
Aevann1 05bacd1efc change reporting flow 2022-09-07 03:22:40 +02:00
Aevann1 7102d4744f css was a mistake 2022-09-07 00:15:22 +02:00
Aevann1 7bbbb117d1 testing on devrama.net 2022-09-07 00:00:58 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 480c38ba44 cosmetic change to popover pfp 2022-09-06 09:03:14 +02:00
Aevann1 199ab85b1c make it even better 2022-09-06 06:39:27 +02:00
Aevann1 dd2c714b9d make rainbow-text look better, THANK YOU HBTZ <3 2022-09-06 06:36:48 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 4ca6cda0e5 hats everywhere 2022-09-06 05:51:55 +02:00
Aevann1 cfa2a31328 make the border for posts less pronounced on dark theme 2022-09-06 05:20:00 +02:00
Aevann1 65d35bca4b show ppls' pfps under hats 2022-09-06 03:47:14 +02:00
Aevann1 f8cd1bea03 make the poll code much worse 2022-09-06 01:33:58 +02:00
Aevann1 62d077576f change poll- and choice- and -bet to -option 2022-09-06 00:54:05 +02:00
Aevann1 73dbb2dd7e change t2_ and t3_ to p_ and c_ 2022-09-06 00:52:22 +02:00
Aevann1 28e9064e28 agony 2022-09-05 23:33:57 +02:00
Aevann1 26e28efbec Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-05 21:46:06 +02:00
Aevann1 4dc7e73499 strip emoji search input 2022-09-05 21:46:04 +02:00
Outrun Colors 4e2a220498 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-05 13:27:06 -05:00
Outrun Colors b1674355c0
Restructure blackjack to only use a single endpoint and better handle "game end" logic 2022-09-05 13:27:00 -05:00
Aevann1 b0016143e5 sneed 2022-09-05 18:00:02 +00:00
Aevann1 6ae4459063 sneed 2022-09-05 14:00:03 +00:00
Aevann1 8c1ceee1ac sneed 2022-09-05 13:00:02 +00:00
Aevann1 919f49ccb2 small css modification 2022-09-05 10:58:59 +02:00
Aevann1 9bf2d75bce fix chat hats 2022-09-05 10:57:11 +02:00
Aevann1 e6d5839e4d fix chat 2022-09-05 06:38:01 +02:00
Aevann1 3eddb8f391 more hat shit 2022-09-05 06:36:31 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 82237ca585 fix prev commit 2022-09-05 05:17:40 +02:00
Aevann1 2636ae62c2 add hats to chat (Part II) 2022-09-05 05:14:03 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 d51869e20a sneed 2022-09-05 01:57:26 +00:00
Aevann1 b0010a455d highlight mobile nav bar icons on click 2022-09-05 03:51:29 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 71b5367874 cachebust all css and js 2022-09-05 01:50:43 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Outrun Colors 1a8c811faa
Re-enable wager after finishing up 2022-09-04 17:04:46 -05:00
Aevann1 75a362bf63 reduce lottery top margin 2022-09-04 23:58:19 +02:00
Aevann1 27ef2d14cc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 23:58:03 +02:00
Aevann1 4995a69ace convert to tabs 2022-09-04 23:58:01 +02:00
Aevann1 41f9a128ac Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 21:53:07 +00:00
Outrun Colors cfa4231f7d
Fix issue with slots not reducing value / center casino games / update user currency without refresh 2022-09-04 16:17:44 -05:00
Aevann1 19e9db0865 sneed 2022-09-04 21:00:04 +00:00
outruncolors 5e1d98a3bf
WIP: Add Casino (Do Not Merge) (#341) 
* Add new /casino route and template

* Consolidate lottery into casino and add initial template for slots

* Change /lottery route to /casino and replace icon with usd symbol and change sitewide const to reflect change

* Hook up new slots method to casino

* Enable Marseybux spending in casino slots

* Add UI for playing blackjack in casino

* First connection of blackjack UI to backend

* Add protective clause thanks to help from carpathianflorist.

* Create new Casino_Game relation and persist inside of blackjack

* Connect new slots behavior to Casino_Game table

* Create UI action management logic

* Add blackjack game status checker which adds persistence for blackjack

* Gonna handle this better, hold on

* Reorganize blackjack helper methods

* Reorganize casino.js to account for new changes

* Connect up to frontend

* Little changes ya know

* Display a message when winning in Blackjack

* Fix some issues with double down and insure

* Revert "remove owoify-py from requirements"

This reverts commit 4454648ea2.

* A little casino styling change

* Reorganize into a casino block

* Smallenize the card'

* Remove references to old game data on comments

* Add sql migration file

* Remove logic to drop old columns

* Fix two forgotten conflicts
 2022-09-04 22:53:34 +02:00
Aevann1 bfaedc99fc restore bottom border 2022-09-04 22:31:50 +02:00
Aevann1 f5b157707c sneed 2022-09-04 20:00:04 +00:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02:00
Aevann1 c41d6bc646 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 18:51:50 +00:00
Aevann1 7a536f87a6 sneed 2022-09-04 16:00:02 +00:00
Aevann1 8bd0ef9251 sneed 2022-09-04 15:00:02 +00:00
Aevann1 39e76a4cf3 sneed 2022-09-04 06:00:02 +00:00
Aevann1 9692a716c6 sneed 2022-09-04 05:00:02 +00:00
Aevann1 a827f41592 sneed 2022-09-04 04:00:02 +00:00
Aevann1 3ba56fcb62 sneed 2022-09-04 03:00:02 +00:00
Aevann1 d45d2b3e07 sneed 2022-09-04 02:00:01 +00:00
gooseman 862b9ebad9 popover hats? 2022-09-03 17:25:00 -07:00
gooseman e0262930ef pp20 hats 2022-09-03 16:53:45 -07:00
Aevann1 b6758de7e5 sneed 2022-09-03 23:00:04 +00:00
Aevann1 57b999385b remove hats not made on the template 2022-09-03 23:33:00 +02:00
Aevann1 d9a9d6bd0e /hats never reloads now, don't read code if u value ur sanity 2022-09-03 22:45:06 +02:00
Aevann1 3e75309821 rewrite sort_table.js, credit to htbz 2022-09-03 20:24:26 +02:00
Aevann1 54aba93d6a sneed 2022-09-03 18:00:02 +00:00
Aevann1 f0e375a0ac sneed 2022-09-03 17:00:02 +00:00
Aevann1 4307b776af sneed 2022-09-03 16:00:02 +00:00
Aevann1 714a1e61c0 sneed 2022-09-03 15:00:04 +00:00
Aevann1 5d63badabd sneed 2022-09-03 14:00:02 +00:00
Aevann1 594b030dc8 sneed 2022-09-03 08:00:02 +00:00
Aevann1 fdd85383f8 sneed 2022-09-03 07:00:02 +00:00
Aevann1 2986ad6fe3 sneed 2022-09-03 06:00:02 +00:00
Aevann1 4456ee6e3f sneed 2022-09-03 05:00:02 +00:00
Aevann1 b1a49d36f6 sneed 2022-09-03 04:00:03 +00:00
Aevann1 18c0cfe94f sneed 2022-09-03 05:56:25 +02:00
Aevann1 f5d9926a35 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 03:10:27 +00:00
Aevann1 48affb53e6 more hat shit 2022-09-03 05:04:51 +02:00
Aevann1 3ff356b984 sneed 2022-09-03 03:00:04 +00:00
Aevann1 38a2cc0e82 fix zombiewolf helmet 2022-09-03 04:45:42 +02:00
Aevann1 c0b88437b5 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 01:13:30 +00:00
Aevann1 db9a995032 more hats 2022-09-03 03:11:10 +02:00
Aevann1 09d1e4d887 more hats 2022-09-03 02:48:01 +02:00
Aevann1 46351f72ee sneed 2022-09-03 00:00:02 +00:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 44183cc767 sneed 2022-09-02 18:00:03 +00:00
Aevann1 a52fe22dc9 fix css rule 2022-09-02 19:56:02 +02:00
Aevann1 567c772b11 add sidebar button for tabletcels 2022-09-02 19:54:01 +02:00
Snakes c506ff0c40 Add admin mute for user reports and modmail. 2022-09-01 17:30:15 -04:00
Aevann1 57c63708ec sneed 2022-09-01 19:00:02 +00:00
Aevann1 673cbdc187 sneed 2022-09-01 03:00:02 +00:00
Aevann1 b97e6fc4b3 sneed 2022-09-01 00:00:03 +00:00
Aevann1 8429be6c95 sneed 2022-08-31 18:00:02 +00:00
Aevann1 29ad6ea1f5 sneed 2022-08-31 16:00:05 +00:00
Aevann1 3d6a541723 sneed 2022-08-31 03:00:01 +00:00
Aevann1 2871d9ad91 sneed 2022-08-30 17:00:05 +00:00
Aevann1 f1003b873d sneed 2022-08-30 15:00:02 +00:00
Aevann1 e9140c6afe sneed 2022-08-30 14:00:02 +00:00
Aevann1 291fe82830 sneed 2022-08-30 06:00:04 +00:00
Aevann1 dbd11ad061 tweak "view source" boxes 2022-08-30 07:37:11 +02:00
Aevann1 40e51af689 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-30 05:08:14 +00:00
Aevann1 c29ca26c93 sneed 2022-08-30 05:00:02 +00:00
Aevann1 c246eb2a43 add 12 sidebar images 2022-08-30 07:00:02 +02:00
Aevann1 7f7866e469 delete duplicate sidebar images 2022-08-30 06:56:55 +02:00
Aevann1 df5122e032 add :marseybussy: (despairmaxxxxing) 2022-08-30 03:39:37 +02:00
Aevann1 34a560f1e6 sneed 2022-08-29 20:00:02 +00:00
Aevann1 1930aa10f6 sneed 2022-08-27 23:00:02 +00:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 67289ffc28 fix chat scrolling on mobile 2022-08-27 02:48:28 +02:00
Aevann1 57c62fad7b do this https://watchpeopledie.co/h/meta/post/6451/changelog-chat-is-now-ioscompatible/117359?context=8#context 2022-08-27 02:15:53 +02:00
Aevann1 421b20c610 fix syntax error in last commit 2022-08-27 00:35:07 +02:00
Aevann1 db53be0991 fix expanded images 2022-08-27 00:34:11 +02:00
Aevann1 22a6dfe402 fix modal max-width 2022-08-27 00:32:00 +02:00
Aevann1 45d5f52388 restore betting 2022-08-26 23:53:17 +02:00
Aevann1 0435081198 don't do more than 1 quote (chat) 2022-08-26 22:44:24 +02:00
Aevann1 edf9911123 don't force websockets 2022-08-26 22:25:17 +02:00
Aevann1 bc743fc169 try now 2022-08-26 21:47:40 +02:00
Aevann1 c7359d90b7 try now 2022-08-26 21:39:50 +02:00
Aevann1 4442f6df93 despair 2022-08-26 21:36:34 +02:00
Aevann1 c19eb23a67 despair 2022-08-26 21:35:58 +02:00
Aevann1 7e491208a3 chat shit 2022-08-26 21:31:46 +02:00
Aevann1 71828e6528 fix Enter on iOS (chat) 2022-08-26 21:28:29 +02:00
Aevann1 58879a49a4 testing on prod 2022-08-26 21:24:24 +02:00
Aevann1 a10739af77 go back to polling for iOScels 2022-08-26 20:41:38 +02:00
Aevann1 750f045776 scroll chat when textarea is clicked 2022-08-26 20:32:25 +02:00
Aevann1 f1f71520bf dude testing on prod lmao 2022-08-26 20:31:53 +02:00
Aevann1 84777d1b29 dude testing on prod lmao 2022-08-26 20:31:28 +02:00
Aevann1 21fc6fe19c dude testing on prod lmao 2022-08-26 20:30:52 +02:00
Aevann1 9f55ff5458 chat depression 2022-08-26 20:30:15 +02:00
Aevann1 2211e81d80 chat 2022-08-26 20:29:05 +02:00
Aevann1 43ac6e96fb scroll chat when textarea is clicked 2022-08-26 19:57:31 +02:00
Aevann1 25a62abc13 use minified version of socket.io 2022-08-26 18:34:38 +02:00
Aevann1 ba24e1c328 remove expanded image 0.5rem vertical margin 2022-08-26 18:30:02 +02:00
Aevann1 e7b997fd01 testing on prod 2022-08-26 18:11:01 +02:00