carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
30,417 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

1468 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann1 d1c5566636 sneed 2022-09-20 05:00:03 +00:00
Aevann1 ba7a4334f7 sneed 2022-09-20 01:00:03 +00:00
Aevann1 0d7a34d966 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-19 20:13:37 +00:00
Aevann1 794669c7db sneed 2022-09-19 20:00:04 +00:00
Aevann1 2c3a583e3c remove bad banner 2022-09-19 21:42:39 +02:00
Aevann1 e3f632a82e sneed 2022-09-19 15:00:03 +00:00
Aevann1 9cee2423d9 sneed 2022-09-18 23:00:03 +00:00
Aevann1 a63e25018f sneed 2022-09-18 21:00:05 +00:00
Aevann1 ffc215bef8 sneed 2022-09-18 16:00:03 +00:00
Aevann1 74cccbf1f9 sneed 2022-09-18 04:00:03 +00:00
Aevann1 929ab60bc1 sneed 2022-09-18 03:00:03 +00:00
Aevann1 4fc83ffdca sneed 2022-09-18 02:00:06 +00:00
Aevann1 d3168c4319 sneed 2022-09-17 22:22:22 +00:00
Aevann1 7947ee014f sneed 2022-09-17 22:00:03 +00:00
Aevann1 7f823e080c sneed 2022-09-17 19:00:05 +00:00
Aevann1 bd81d5f0ed fix :marseyhatium: 2022-09-17 20:16:00 +02:00
Aevann1 4f24d7ec7e sneed 2022-09-17 16:00:02 +00:00
Aevann1 4ef252de2a sneed 2022-09-17 15:17:36 +00:00
Aevann1 ab00cfec43 sneed 2022-09-17 15:00:05 +00:00
Aevann1 386be57c29 sneed 2022-09-17 05:00:02 +00:00
Aevann1 6dfa907998 sneed 2022-09-17 02:00:02 +00:00
Aevann1 2553a16dcf sneed 2022-09-16 21:00:05 +00:00
Aevann1 f915178c35 sneed 2022-09-16 16:00:04 +00:00
Aevann1 62753678b4 sneed 2022-09-16 15:00:05 +00:00
Aevann1 1f7c64aaa5 sneed 2022-09-16 05:00:02 +00:00
Aevann1 cd332683a0 sneed 2022-09-16 04:00:03 +00:00
Aevann1 1ca88f719e sneed 2022-09-15 18:00:02 +00:00
Aevann1 dd5fe2b281 sneed 2022-09-15 16:00:01 +00:00
Aevann1 c4ea4c64de sneed 2022-09-15 04:00:03 +00:00
Aevann1 3a6c3d29a8 sneed 2022-09-15 03:00:02 +00:00
Aevann1 b4a9471ea1 sneed 2022-09-15 02:00:02 +00:00
Aevann1 fb3b6c4d66 sneed 2022-09-14 18:00:02 +00:00
Aevann1 81d7ebb5ba Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-14 15:15:36 +00:00
Aevann1 3016b87f21 sneed 2022-09-14 15:00:02 +00:00
Aevann1 74db58e54b Revert "WPD: enable rotating sidebar art & admin thread." 
This reverts commit 5ddf1c979a.
 2022-09-14 16:16:27 +02:00
Aevann1 e846c26516 sneed 2022-09-14 14:00:02 +00:00
Aevann1 f91684702f sneed 2022-09-14 03:00:04 +00:00
Aevann1 14c72fb99e sneed 2022-09-14 02:00:02 +00:00
Aevann1 94e032c5fe sneed 2022-09-13 22:03:14 +00:00
Aevann1 4f290d1fab sneed 2022-09-13 20:17:28 +00:00
Aevann1 d69a853c77 sneed 2022-09-13 16:00:04 +00:00
Aevann1 3eab2e84d2 sneed 2022-09-13 14:00:02 +00:00
Aevann1 55029de8b1 sneed 2022-09-13 13:00:02 +00:00
Aevann1 cfc7570143 sneed 2022-09-13 11:00:04 +00:00
Aevann1 799f8a465b delete duplicate sidebar images 2022-09-13 11:28:38 +02:00
Aevann1 53ba5e0a12 sneed 2022-09-13 04:00:04 +00:00
Aevann1 84d76187c9 sneed 2022-09-13 01:19:26 +00:00
Aevann1 76aaca0039 sneed 2022-09-13 01:19:22 +00:00
outruncolors 7d8cfe5576
Add Roulette (#351) 
* Add roulette file

* Rename variable to avoid name collission

* Add basic route and create new template for game

* More work on the roulette template

* Initial connection of front-end roulette to back-end roulette

* Add to cron job

* Pass bets to the front end

* Update front-end looks

* Add stackable poker chips for bets

* Minor last changes

* Handle minimum bets

* Add bet table
 2022-09-12 20:07:39 -05:00
Aevann1 8613b867a5 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 17:34:26 +00:00
Aevann1 192e79f359 add grillcastyes 2022-09-12 19:34:12 +02:00
Aevann1 da98858e24 sneed 2022-09-12 17:00:03 +00:00
Aevann1 8299c48464 sneed 2022-09-12 15:00:02 +00:00
Aevann1 c96d6097b1 Revert "mass trim emojis" 
This reverts commit 706f3e9440.
 2022-09-12 13:12:01 +02:00
Aevann1 5b736da19c change marseyemperor 2022-09-12 13:05:20 +02:00
Aevann1 be2ff53d85 mass trim badges 2022-09-12 11:31:04 +02:00
Aevann1 46e7be0c0b mass trim sidebar images 2022-09-12 11:28:12 +02:00
Aevann1 706f3e9440 mass trim emojis 2022-09-12 11:20:03 +02:00
Aevann1 7d3c67d1c2 sneed 2022-09-12 08:00:04 +00:00
Aevann1 d6a0426d89 change name of hat 2022-09-12 09:26:32 +02:00
Aevann1 022e754a34 sneed 2022-09-12 05:00:05 +00:00
Aevann1 950bb0b9cb sneed 2022-09-12 04:00:02 +00:00
Aevann1 f21848e4ff sneed 2022-09-12 01:00:02 +00:00
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 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 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 65b6c743b4 sneed 2022-09-10 03:00:02 +00:00
Aevann1 3a9441a582 sneed 2022-09-10 01:00:03 +00:00
Aevann1 41e18ee32d sneed 2022-09-10 00:00:02 +00: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 128400d259 sneed 2022-09-08 16:00:02 +00: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 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02: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 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 19e9db0865 sneed 2022-09-04 21:00:04 +00: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 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
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 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 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 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 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 aa2c18a81d sneed 2022-08-26 09:00:02 +00:00
Aevann1 66e03b01b9 sneed 2022-08-26 06:00:02 +00:00
Aevann1 b52822640d sneed 2022-08-26 01:00:04 +00:00
Aevann1 c8ed20cd9c add patron badges for WPD 2022-08-25 19:29:31 +02:00
Aevann1 1604e7f07d change WPD cached banner 2022-08-24 22:50:41 +02:00
Aevann1 06940ad2b4 sneed 2022-08-24 17:00:04 +00:00
Aevann1 9f04de5124 sneed 2022-08-24 01:40:17 +00:00
Aevann1 1b07392cd5 fix up sidebar image 2022-08-23 00:32:56 +02:00
Aevann1 ed037a486c sneed 2022-08-20 21:00:04 +00:00
Aevann1 82e8d4a15e sneed 2022-08-20 19:00:02 +00:00
Aevann1 f40cc49ed1 removev sidebar image i added 2022-08-20 14:07:25 +02:00
Aevann1 4ca7e44657 sneed 2022-08-20 02:00:01 +00:00
Aevann1 f17e7f9cc2 sneed 2022-08-20 00:00:02 +00:00
Snakes 0a1e1c7c96
PCM: swap banner. 2022-08-19 11:19:02 -04:00
Aevann1 702aa72e93 sneed 2022-08-18 23:00:03 +00:00
Aevann1 d5963dd458 WPD: sneed. 2022-08-17 22:36:48 +00:00
Aevann1 f8000196e0 sneed 2022-08-17 22:28:40 +00:00
Aevann1 a04850714b sneed 2022-08-17 22:20:46 +00:00
Aevann1 6765655eb9 scale up taycrunch (thx @tax) 2022-08-17 18:33:13 +02:00
Aevann1 da96603c5a Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-16 17:42:48 +00:00
Aevann1 a5ec730bb8 fix up marseyimposter 2022-08-16 19:04:07 +02:00
Aevann1 9fb00ba503 sneed 2022-08-16 17:00:02 +00:00
Aevann1 27d2802d2a sneed 2022-08-16 01:46:57 +00:00
Aevann1 8e8264de92 kill LGB 2022-08-15 17:24:40 +02:00
Aevann1 98fae32a93 sneed 2022-08-15 15:00:04 +00:00
Snakes 5ddf1c979a
WPD: enable rotating sidebar art & admin thread. 2022-08-14 20:12:55 -04:00
Aevann1 7eb4d9bfed sneed 2022-08-14 22:00:03 +00:00
Snakes d96320e7d7
Hats: temporary flower-crown event. 2022-08-14 17:39:47 -04:00
Aevann1 2cc240a0c5 change marsey name 2022-08-14 05:06:33 +02:00
Aevann1 33018c164b sneed 2022-08-12 18:00:02 +00:00
Snakes b81b19d838
PCM: change banner. 2022-08-11 20:24:29 -04:00
Aevann1 d392a213d5 sneed 2022-08-12 00:00:02 +00:00
Aevann1 d933614ef4 sneed 2022-08-11 23:00:02 +00:00
Aevann1 2957db79ce site_preview change for rdrama 2022-08-12 00:56:33 +02:00
Aevann1 1a0da2c9a7 sneed 2022-08-11 17:00:01 +00:00
Aevann1 26959e0751 murder deuxrama.net 2022-08-11 18:46:11 +02:00
Snakes 249c593379 Hats: frontend interface, migrate cakeday. 
Getting the basic hats frontend changes into master so my branch stops
diverging from the templates. Migrates the existing cakeday partyhat
functionality to the new system also.

Establishes a (hopefully) static interface for PFP hat display:
  - Hat image assets are 100px w x 130px h and anchored to the bottom-
    left corner of pfps.
  - User.hat_active provides either empty string or the internal
    string identifier for active user hat.
  - User.hat_tooltip provides mouseover text. Likely only to be used
    for cakeday hats on one's cakeday.

Additionally, per discussion with Carp, PFPs in comments and posts
increased from 25px diameter to 30px.
 2022-08-11 03:30:43 -04:00
Aevann1 248545e235 sneed 2022-08-11 05:00:02 +00:00
Aevann1 36e25b4080 sneed 2022-08-10 22:00:02 +00:00
Aevann1 484788bbc1 sneed 2022-08-08 23:00:02 +00:00
Aevann1 39c5a08fbf sneed 2022-08-06 04:00:02 +00:00
Aevann1 85a7b223fb sneed 2022-08-05 21:00:01 +00:00
Aevann1 fe0d1beb6e sneed 2022-08-05 14:00:01 +00:00
Aevann1 649bc1d103 sneed 2022-08-04 16:00:02 +00:00
Snakes da55adb790
rDrama: banners: remove 114, compress new; ICP. 2022-08-04 03:20:47 -04:00
Snakes ac948acb4a
PCM: swap banners, move banners to distinct URL. 2022-08-03 19:21:21 -04:00
Aevann1 5aff344efe fix bad quality 2022-08-02 23:54:33 +02:00
Aevann1 0a5c1353ec Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-02 23:51:18 +02:00
Aevann1 9f22c63264 thanks geese for wpd banner 2022-08-02 23:51:15 +02:00
Aevann1 f8ef2b1e60 sneed 2022-08-02 20:10:15 +00:00
Aevann1 f12f67405a cached banner for WPD 2022-08-02 00:05:39 +02:00
Aevann1 3410a47a73 sneed 2022-08-01 05:00:02 +00:00
Snakes b75d504d91
rDrama: swap header icon for Carp's juggalo event. 2022-07-31 23:50:19 -04:00
Aevann1 dd76c0ec69 add an extra sidebar image to deux 2022-07-28 19:30:24 +02:00
Aevann1 46bc54cd2a change deux cover 2022-07-28 19:23:02 +02:00
Snakes f23b93fbe9
LGB: add sidebar rDrama shoutout. 2022-07-19 22:20:57 -04:00
Snakes f72fcd00b9
LGB: emoji content. 2022-07-18 00:34:55 -04:00
Nekobit bde47271d7
Allow Inline Emoji modal in more areas (#318) 
* Sneed

* Bust cache
 2022-07-17 07:42:03 +02:00
Aevann1 664029a9fb sneed 2022-07-16 21:00:02 +00:00