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

1173 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann1 25c6673f5c allow ppl to reply to DMs multiple times without refreshing 2022-09-20 21:06:26 +02:00
Aevann1 272e39ebf2 add spider award 2022-09-20 19:52:52 +02:00
Aevann1 aa5752530a make max num of fireflies same max num of bugs 2022-09-20 19:27:41 +02:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 b62f9ac30d fix pusher 2022-09-17 22:39:52 +02:00
Aevann1 56a7347fc1 add confirmation for chat msg deletion 2022-09-14 13:25:00 +02:00
Aevann1 af66453f2b fix NaN on gifting on mobile 2022-09-13 19:45:00 +02:00
Aevann1 9f6ec11cd4 remove unnecessaryu block from bootstrap.js 2022-09-13 13:05:13 +02:00
Aevann1 0e198ffcdb remove unused var 2022-09-13 12:52:32 +02:00
Aevann1 7e811b47fb reporting improvement 2022-09-12 11:48:01 +02:00
Aevann1 3dc755e5a0 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705957?context=8#context 2022-09-12 09:53:01 +02:00
Aevann1 56c4f8ccf0 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705881?context=8#context 2022-09-12 09:34:12 +02:00
Aevann1 73ff78d0f5 fix 1st part of this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705204?context=8#context 2022-09-12 06:38:04 +02: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 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 47890d771d add Marsey Submission UI 2022-09-09 11:13:50 +02:00
Aevann1 23338e8172 try to fix the wrong method error on giving awards 2022-09-08 21:21:41 +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 05bacd1efc change reporting flow 2022-09-07 03:22:40 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +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 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 b1674355c0
Restructure blackjack to only use a single endpoint and better handle "game end" logic 2022-09-05 13:27:00 -05: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 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 4995a69ace convert to tabs 2022-09-04 23:58:01 +02: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
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 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
Snakes c506ff0c40 Add admin mute for user reports and modmail. 2022-09-01 17:30:15 -04:00
Aevann1 dbd11ad061 tweak "view source" boxes 2022-08-30 07:37:11 +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 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 e7b997fd01 testing on prod 2022-08-26 18:11:01 +02:00
Aevann1 fdf8d0511f fix issues with chat 2022-08-26 16:53:56 +02:00
Aevann1 432f90b8d8 try to fix 2022-08-26 01:34:20 +02:00
Aevann1 54a5357136 why did i write this garbage code 2022-08-26 01:31:31 +02:00
Aevann1 027a4a854a fix prev commit 2022-08-26 01:30:05 +02:00
Aevann1 0aa631fa13 fix prev commit 2022-08-26 01:24:29 +02:00
Aevann1 11d7f34ad0 allow hole jannies to change the hole marsey + cachebust all site assets 2022-08-25 00:22:44 +02:00
Aevann1 9be2897eac remove the voting javascript logic I added for myself 2022-08-24 16:30:30 +02:00
booosy 50c39755fd Add trailing newlines 2022-08-24 04:18:07 -04:00
booosy 52d0ab537f add search help dropdown 2022-08-24 04:18:07 -04:00
Aevann1 94b0045371 remove "view original" 2022-08-19 16:11:42 +02:00
Aevann1 26bbc8b69a perserve the first 4 checkboxes in /submit too 2022-08-15 08:42:59 +02:00
Aevann1 01cc1726cc fix chat flash 2022-08-15 07:19:41 +02:00
Aevann1 fca0f5434b pretty up chat 2022-08-14 15:38:08 +02:00
Aevann1 fefe9f1bde partially revert 835ee3e577 2022-08-14 14:43:50 +02:00
Aevann1 a817fc35c0 show online on chat in dropdown menu 2022-08-14 05:51:25 +02:00
Aevann1 e73fa11696 fix submit.js 2022-08-14 05:20:43 +02:00
Aevann1 47b6139f7c fix submit.js 2022-08-14 05:18:52 +02:00
Aevann1 c6c5c6b45b chat cosmetic changes 2022-08-13 13:07:57 +02:00
Aevann1 13a6243496 revert prev commit 2022-08-13 11:15:36 +02:00
Aevann1 7b2d7bb884 cosmetic changes to chat 2022-08-13 11:15:02 +02:00
Aevann1 5c0dd43688 cosmetic changes to chat 2022-08-13 11:14:21 +02:00
Aevann1 dbbcd77e9a cosmetic changes to chat 2022-08-13 11:13:15 +02:00
Aevann1 7bc856d393 cosmetic changes to chat 2022-08-13 11:12:18 +02:00
Aevann1 0a1927e4f2 cosmetic changes to chat 2022-08-13 11:11:56 +02:00
Aevann1 eb684a90b7 cosmetic changes to chat 2022-08-13 11:10:57 +02:00
Aevann1 b3c52b0660 fix prev commit 2022-08-13 09:26:00 +02:00
Aevann1 64e3ceb40f add more details to chat tooltip 2022-08-13 09:23:23 +02:00
Aevann1 835ee3e577 replace data-bs-original-title with title 2022-08-13 09:20:41 +02:00
Aevann1 f6729aab33 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2487028?context=8#context 2022-08-11 19:18:53 +02:00
Aevann1 abd3b0244f fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2486746?context=8#context 2022-08-11 19:11:24 +02:00
Aevann1 cb91ccc046 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2329888?context=8#context 2022-08-11 19:10:54 +02:00
Aevann1 3daab0586b fix typo 2022-08-11 19:01:44 +02:00
Aevann1 f563d6b932 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2402363?context=8#context 2022-08-11 13:39:38 +02:00
Aevann1 a6f1fb17c9 improve expanding images 2022-08-11 09:24:01 +02:00
Aevann1 1000f9c45e Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-11 06:05:26 +02:00
Aevann1 cfa17aaf68 rename some retarded ruqqus terminology 2022-08-11 06:04:41 +02:00
Snakes f2030077f0
Fix /shop purchase confirmation buttons. 2022-08-10 17:28:45 -04:00
Snakes 1411018f8d Add post categories. 
Implemented for LGB but can likely be used for WPD and other future
sites. Similar to a reddit post flair. Provides:
  - Admin panel for Category management.
  - Category selection on post submission.
  - 'Recategorize' post action.
 2022-08-07 02:57:30 -04:00
Aevann1 d1cb115ada fix comment editting bug 2022-08-06 16:04:34 +02:00
Aevann1 d99c77cba9 add confirmation dialog to buying awards 2022-08-06 04:03:10 +02:00
Aevann1 c8ea663833 remove filename when commenting 2022-08-05 22:00:16 +02:00
Aevann1 db10272e1b delete contents of preview when submitting comments 2022-07-23 11:19:47 +02:00
Aevann1 f543abaaab fix 46786e117b 2022-07-23 11:08:02 +02:00
Aevann1 a4444c9402 make form a const 2022-07-23 10:57:53 +02:00
Aevann1 29a2bc0123 allow ppl to click on the reply icon again to hide the reply box 2022-07-23 10:53:43 +02:00
Aevann1 46786e117b allow ppl to make multiple comments to the same parents without reloading the page 2022-07-23 10:53:17 +02:00
Snakes b4fdf248ef LGB: disable profile bio, banner, song. 2022-07-19 21:20:52 -04:00
Snakes 3225a2a3d4
LGB: disable awards, badges. 2022-07-19 19:59:39 -04:00
Aevann1 d011055421 fix ghostdiv 2022-07-17 19:35:29 +02:00
DrTransmisia e9d57ba68a
typo (#320) 
le typo has gone
 2022-07-17 19:05:24 +02:00
Nekobit aaabd0cc79
Fix (#319) 
* Sneed

* Bust cache

* Fix widescreens emoji picker
 2022-07-17 19:05:11 +02:00
Nekobit bde47271d7
Allow Inline Emoji modal in more areas (#318) 
* Sneed

* Bust cache
 2022-07-17 07:42:03 +02:00
Nekobit 4b47faa1ed
Inline Emojo Picker (#317) 
* Inline emoji picker

* Inline text editor
 2022-07-17 07:02:22 +02:00
Aevann1 664029a9fb sneed 2022-07-16 21:00:02 +00:00