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
Aevann c0c3b248e0 benchmark 2023-10-27 10:16:41 +03:00
Aevann d419a8bbe5 fix console error 2023-10-27 01:27:34 +03:00
Aevann 8a82a9b112 show pride username in chat 2023-10-26 22:16:29 +03:00
Aevann 63f571b1ce fix negative award quantities 2023-10-26 20:59:20 +03:00
Aevann 141d2a9598 stop conflicting tooltips 2023-10-26 19:29:54 +03:00
Aevann aeee820c33 show prices of "0 owned" awards 2023-10-26 19:13:36 +03:00
Aevann b04147e4a3 emojis_json -> emojis.json 2023-10-26 18:25:05 +03:00
Aevann 7140e9670a same as last commit 2023-10-26 18:23:17 +03:00
Aevann d63face5cd fix error 2023-10-26 18:22:03 +03:00
Aevann c80a22e8a0 print debugging 2023-10-26 18:18:16 +03:00
Aevann b60f3deb90 show appropriate author credit for emojis 2023-10-26 17:58:58 +03:00
Aevann 25b65e7a2f perserve sync for ppl who join during break 2023-10-21 05:31:23 +03:00
Aevann 77bd67dd3e make it 5 minutes again 2023-10-19 22:23:06 +03:00
Aevann 8bf203bcc2 reduce to 1 min 2023-10-19 22:10:04 +03:00
Aevann c6e4f2be6c remove unnecessary window. 2023-10-19 22:08:32 +03:00
Aevann 75d7210eb0 fix prev commit 2023-10-19 22:01:52 +03:00
Aevann cc076e2600 dedup 2023-10-19 22:00:24 +03:00
Aevann 285ac4d67d fix music playing 2023-10-19 21:58:44 +03:00
Aevann b3a7df3346 lazyload desktopUserBanner 2023-10-18 23:20:35 +03:00
Aevann 0eb9af2237 make music only play after window.load https://stackoverflow.com/a/27300171 2023-10-18 23:10:45 +03:00
Aevann ca68b3f947 minor fix to profile song logic 2023-10-18 22:07:06 +03:00
Aevann f1703f31f6 fix console error 2023-10-17 23:35:47 +03:00
Aevann 8ccd8173a3 dont play music in multiple tabs 2023-10-17 22:35:00 +03:00
Aevann afd101abc9 make sure speed emoji modal always closes 2023-10-17 21:59:16 +03:00
Aevann 572c3e043d remove now-unnecessary shit (i replaced in db) 2023-10-17 15:50:39 +03:00
Aevann 1a33ce9d1a use my pen 2023-10-17 15:10:07 +03:00
Aevann d71b211dee resync after buffering 2023-10-16 22:42:34 +03:00
Aevann 7d8300c24e add space 2023-10-16 22:03:02 +03:00
Aevann 4d42107ed3 orgy: increase chat window height 2023-10-16 20:55:16 +03:00
Aevann a6ed627c1b dynamic chat window size on mobile depending on orgy video height 2023-10-15 19:33:43 +03:00
Aevann 502fb2bb64 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/5171921#context 2023-10-15 18:51:59 +03:00
Aevann 5fc27db8d4 remove unnecessary toString() 2023-10-15 18:48:56 +03:00
Aevann 1488af13d8 make sure chat scrolls 2023-10-15 18:14:47 +03:00
Aevann a3c8dc0d87 consistency 2023-10-14 22:29:33 +03:00
Aevann 75ff9cfe1c do this https://watchpeopledie.tv/h/meta/post/61549/megathread-for-bugs-and-suggestions/1871119#context 2023-10-14 22:09:55 +03:00
Aevann 58f76ae3f6 use some js in /admin/apps for rejecting 2023-10-14 01:39:23 +03:00
Aevann be9e8f558d comment-collapse-desktop > comment-collapse-line 2023-10-14 01:01:32 +03:00
Aevann f61ba62426 add more orgy controls 2023-10-13 18:56:12 +03:00
top 89615a7a53 Fix pushed after double down showing wrong visual indicator (#214) 
Co-authored-by: Chuck <dude@bussy.com>
Reviewed-on: rDrama/rDrama#214
Co-authored-by: top <top@noreply.fsdfsd.net>
Co-committed-by: top <top@noreply.fsdfsd.net>
 2023-10-13 12:19:10 +00:00
Aevann b39c2ad216 use audio tags so i can use preload="None" and hopefully help site speed 2023-10-12 22:58:28 +03:00
Aevann 4d999751d1 use audio tags so i can use preload="None" and hopefully help site speed 2023-10-12 22:50:35 +03:00
top 5fdfc77056 top/slightly-improve-stalker-performance (#213) 
Tbh thought this would have more of an impact but only improves performance of the animation about 25%. Apparently stalker isn't actually that big of an issue. Either way it saves on css recalculations and repaints.

Also update blackjack to show the correct visual state for the dealer

Co-authored-by: Chuck <dude@bussy.com>
Reviewed-on: rDrama/rDrama#213
Co-authored-by: top <top@noreply.fsdfsd.net>
Co-committed-by: top <top@noreply.fsdfsd.net>
 2023-10-12 13:13:41 +00:00
Aevann b21f3028cf remove the bouncing/horiz picker when awarding to comments since not applicable 2023-10-10 23:34:35 +03:00
Aevann 133b9a7347 remove pointless element 2023-10-10 22:45:54 +03:00
Aevann 3f9913fc7f stop using 204 2023-10-10 22:34:38 +03:00
Aevann 3295214bf3 dont grey out the "buy" button in shop 2023-10-10 21:23:14 +03:00
Aevann ba1f14bdf5 update "X owned" next to "give award" in realtime 2023-10-10 20:39:05 +03:00
Aevann c2d002452c keep "are you sure" for easier mass giving of awards 2023-10-10 20:09:48 +03:00
Aevann 7759229178 change award modal 2023-10-10 19:53:46 +03:00
Aevann 19c352c8f0 replace train and scooter award with a "horizontal" selection to "emoji" award 2023-10-09 01:42:05 +03:00
Aevann 90b3b7cbd3 dont load ctrl+enter code in chat to prevent console error 2023-10-08 22:56:14 +03:00
Aevann e332387d43 allow shift+enter in chat 2023-10-08 22:55:52 +03:00
Aevann 7e1de2bd59 order users online list by time of join instead of it getting ordered automatically during websocket transit by id 2023-10-07 22:50:12 +03:00
Aevann d7dda8eba5 fix "too many packets in payload" error 2023-10-07 21:14:03 +03:00
Aevann d3d7254e83 fix "too many packets in payload" error 2023-10-07 20:56:24 +03:00
Aevann 62d1940a8f sub -> hole 2023-10-07 20:55:50 +03:00
Aevann 8d36b418c1 dont move the house select unless the user accepts the warning 2023-10-07 17:37:05 +03:00
Aevann b0e501b51b restore heartbeat to remove online hangovers (especially after orgy) https://i.imgur.com/LLxlpY4.png 2023-10-07 13:54:21 +03:00
Aevann d1108f1fad emote -> emoji 2023-10-06 21:56:56 +03:00
Aevann 1883081451 fix inline emoji modal 2023-10-06 20:18:05 +03:00
Aevann ef4096b849 add gif button to award modal 2023-10-06 17:57:11 +03:00
Aevann 912911cf3d focus textarea again when dismissing gif modal 2023-10-06 17:46:52 +03:00
Aevann 9cb397bdf3 add emoji button to report modal and award modal 2023-10-06 17:32:40 +03:00
Aevann f1d661d2a0 focus textarea again when dismissing emoji modal 2023-10-06 17:31:36 +03:00
Aevann 8b853df4b7 use youtube.com for embed instead of youtube-nocookie.com to allow playing in background on mobile 2023-10-05 21:18:43 +03:00
Aevann 3e27dbec0a hide "aw shucks no gifs found" when returning a successful search 2023-10-05 19:17:46 +03:00
Aevann 1c35d5fde3 more descriptive function name 2023-10-05 19:17:16 +03:00
Aevann 689be547d7 fix award note causing a "Leave site" warning 2023-10-05 19:10:50 +03:00
Aevann 904d41230f fix chat file button 2023-10-05 15:40:03 +03:00
Aevann bb7192c929 rename over_18 to nsfw 2023-10-05 13:19:50 +03:00
Aevann aeb9e669d4 rename over18 and over-18 to nsfw 2023-10-05 13:15:05 +03:00
Aevann e687537813 Revert "stop online and typing from hanging" 
This reverts commit 57b60e9128.
 2023-10-04 22:53:54 +03:00
Aevann 57b60e9128 stop online and typing from hanging 2023-10-04 22:02:53 +03:00
Aevann 9852520cf1 stop "remove attachment" button from overflowing on mobile 2023-10-04 20:03:03 +03:00
Aevann afaa0bcb02 add spaces 2023-10-04 20:00:47 +03:00
Aevann ff155f0499 put the cost in the house change warning 2023-10-04 19:58:10 +03:00
Aevann 7fced29fba change wholesome award to emoji award 2023-10-04 16:05:43 +03:00
Aevann ee369f6a8e fix console error on error pages 2023-10-02 18:02:39 +03:00
Aevann 2e3fb6d521 fix inline emoji search inside "report post" modal in post_listing.html 2023-10-02 18:00:40 +03:00
Aevann c061936b53 make award immunity only apply to negative awards 2023-10-02 17:24:09 +03:00
Aevann f4a790edd8 fix this https://rdrama.net/post/208130/updated-episode-of-the-podcast-where/5083191#context 2023-10-02 11:12:54 +03:00
Aevann 5c80f0017f no more href="#" 2023-10-02 09:06:29 +03:00
Aevann 5df365f546 change id 2023-10-02 09:04:38 +03:00
Aevann 776d9fc091 revert the modal change 2023-10-02 09:04:05 +03:00
Aevann 3cce4f28fb show char limit when toggling post and comment edit + other minor improvements 2023-10-02 07:58:25 +03:00
Aevann 6d7c421466 dont lazyload my own generated shit since its gonna get displayed anyway 2023-10-02 07:39:54 +03:00
Aevann b966b69594 remove unused function 2023-10-02 07:33:28 +03:00
Aevann edd07137f7 add end_utc to file orgies 2023-10-02 07:21:04 +03:00
Aevann a161765aaa allow carp to send ppl a comment when approving hats or emojis 2023-10-02 06:40:30 +03:00
Aevann 2f3699a706 move to bottom again so it doesnt interfere with the #context thing 2023-10-02 06:14:35 +03:00
Aevann 19b8e18db2 desktop-expanded-image > expanded-image 2023-10-02 06:12:06 +03:00
Aevann 9245db0328 fix all emojis getting marked as nsfw 2023-10-02 05:46:59 +03:00
Aevann 28117b5159 better solution to the modal scrollbar question 2023-10-02 05:20:13 +03:00
Aevann 519ebb3fb4 fix post editing 2023-10-01 17:23:29 +03:00
Aevann a9f9bd9bb1 fixes to modal commit 2023-10-01 15:57:41 +03:00
Aevann 92a5174466 use my own modal system instead of bootstrap in preparation for potentially not using bootstrap.js anymore (also I like it more and wanna see if anybody notices any changes at all) 2023-10-01 15:03:52 +03:00
Aevann 7a39560f21 dont use replacestate, it fucks shit up 2023-09-30 15:03:17 +03:00
Aevann 0bcaef2e7f use history objection instead of location object to stop page from jumping unnecessarily 2023-09-30 00:13:40 +03:00
Aevann 00ffbfe3d4 add asset reject reason 2023-09-29 10:59:27 +03:00
Aevann 4d2b7be757 switch around the id and username in chat online list 2023-09-29 10:38:54 +03:00
Aevann 43822b3322 add nsfw emojis 2023-09-29 10:15:29 +03:00
Aevann ed435cf86b remove some "window." instances 2023-09-29 09:11:18 +03:00
Aevann 99fcbebff5 replace hash to prevent unnecessary jumping when the user alrdy has a hash 2023-09-29 07:50:42 +03:00
Aevann 445f7c5598 fix inline-emoji-search placement in chat 2023-09-29 07:10:55 +03:00
Aevann b74ba0a317 get rid of some TODOs 2023-09-29 06:19:51 +03:00
Aevann f97f1f160c Revert "make orgy youtube video autoplay (works only in these cases https://stackoverflow.com/a/50890610)" 
This reverts commit 2fe4c51565.
 2023-09-29 05:22:36 +03:00
Aevann ab9172ed06 Revert ""window." -> """ 
This reverts commit 854693124a.
 2023-09-29 04:10:05 +03:00
Aevann 8e47a31c97 remove cringe space 2023-09-29 03:44:22 +03:00
Aevann 854693124a "window." -> "" 2023-09-29 03:37:03 +03:00
Aevann 9f7a761b73 homoween III + other random shit 2023-09-29 02:58:09 +03:00
Aevann 749ebe4e23 fix error when comment doesnt exist on the page ur currently in 2023-09-28 01:10:06 +03:00
Aevann 8a1a941e50 fix flashing 2023-09-26 23:20:43 +03:00
Aevann beeabce0ee use SITE_FULL_IMAGES in js 2023-09-26 23:09:34 +03:00
Aevann e7ab0be33b make /notifications/messages LIVE 2023-09-26 23:05:39 +03:00
Aevann 7b960d8809 minify critters.js 2023-09-26 22:08:35 +03:00
Aevann 0600c63c0b more aethetic code 2023-09-26 21:39:05 +03:00
Aevann 2fe4c51565 make orgy youtube video autoplay (works only in these cases https://stackoverflow.com/a/50890610) 2023-09-26 18:50:26 +03:00
Aevann c9f3b95f86 refresh chat automatically when orgy starts 2023-09-26 15:29:36 +03:00
Aevann 8916ae279c remove second in chat timestamp (more plaesing to the eye this way) 2023-09-26 13:39:15 +03:00
Aevann f8c177172d shorter time code that achieves same results and respects locale's AM-PM preference 2023-09-26 13:20:49 +03:00
Aevann d089d18e2d merge /chat and /orgy again 2023-09-25 01:12:42 +03:00
Aevann 66e8dd509d fix this https://rdrama.net/post/103085/if-u-made-a-higher-quality/5042949#context 2023-09-23 22:36:22 +03:00
Aevann cace8266d9 fix this https://media.discordapp.net/attachments/1100416711095758861/1154930281631977533/IMG_7335.png?width=282&height=611 2023-09-23 20:52:38 +03:00
Aevann 3c98ab5c42 fix friday refresh 2023-09-22 23:23:08 +03:00
Aevann 2a31e8a841 fix orgy refreshing 2023-09-22 00:05:14 +03:00
top 24eafc85d8 Adds some bug fixes QoL changes to the blackjack game. (#203) 
Updates the wager text to show the wager for both hands instead of the original wager since splitting doubles the bet.

Adds the ability to split face cards/ten which is allowed in the rules most casinos (it's also universally terrible so idk why anyone would actually split 10s).

Adds the ability to double down on 9 as requested by annoyingthegoyim, probably increases EV a very small amount but not really noticeable since 9 is a pretty rare opening hand (and worse than double down on 10 or 11).

Moves the split button to after hit/stay since some users complained about splitting by accident due to button placement

Co-authored-by: Chuck <dude@bussy.com>
Reviewed-on: rDrama/rDrama#203
Co-authored-by: top <top@noreply.fsdfsd.net>
Co-committed-by: top <top@noreply.fsdfsd.net>
 2023-09-21 13:31:02 +00:00
Aevann b632ff5e4a refresh /orgy at 20:00 too 2023-09-20 20:56:24 +03:00
Aevann edb2cd5189 print-debugging 2023-09-20 19:45:05 +03:00
Aevann 856d0e5023 fix button switching on 3 buttons 2023-09-20 17:57:34 +03:00
Aevann f0a5349519 Revert "Revert "Adds blackjack split (#197)"" 
This reverts commit 9daa939cae.
 2023-09-18 19:31:58 +03:00
Aevann c51ddabc97 scroll to top when changing emoji search query 2023-09-18 14:43:05 +03:00
Aevann 13e83143fd fix approving/removing hats with `(` in name 2023-09-17 23:32:41 +03:00
Aevann 89e0d49b38 same as last commit 2023-09-17 23:29:24 +03:00
Aevann 2be5361551 print-debug something 2023-09-17 23:27:57 +03:00
Aevann 802892a2e1 fix files in /submit 2023-09-17 22:14:07 +03:00
Aevann 8f4f0b8cb3 disable "submit" buttons unless theres a value in textbox to prevent annoying misclicks 2023-09-15 16:55:27 +03:00
Aevann 9daa939cae Revert "Adds blackjack split (#197)" 
This reverts commit 30d10f638e.
 2023-09-15 14:30:08 +03:00
top 30d10f638e Adds blackjack split (#197) 
Holy shit this was a massive pain, done now though lol.

I recommend additional testing, I mean I did test this a ton locally but I also spent 3 hours fixing bugs and maybe missed something

Co-authored-by: Chuck <dude@bussy.com>
Reviewed-on: rDrama/rDrama#197
Co-authored-by: top <top@noreply.fsdfsd.net>
Co-committed-by: top <top@noreply.fsdfsd.net>
 2023-09-15 11:27:00 +00:00
Aevann e78a6f539d remove unnecessary slash 2023-09-15 04:24:16 +03:00
Aevann 0c9a7e76bc do this https://watchpeopledie.tv/h/meta/post/61549/megathread-for-bugs-and-suggestions/1685005#context 2023-09-15 03:33:08 +03:00
Aevann 7a57781013 minor reformat 2023-09-15 03:25:54 +03:00
Aevann 1b3e59b7a7 regex consistency 2023-09-15 01:22:10 +03:00
Aevann d429c4e504 fix "remove attachment" make it impossible to upload another attachment 2023-09-14 02:33:38 +03:00
Aevann ab46b7992b fix header chat count during orgy 2023-09-14 02:21:46 +03:00
Aevann 9a877378c9 refresh /orgy automatically 2023-09-14 02:01:08 +03:00
Aevann 9c30395438 fix this https://rdrama.net/h/toomanyxchromosomes/post/203894/coomer-foid-marseyfans-running-for-a/4981351#context 2023-09-13 02:20:39 +03:00
Aevann 4838784a98 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4949321#context 2023-09-13 01:57:46 +03:00
Aevann 95fbe1cf67 fix minor page title issue in orgy chat 2023-09-13 01:04:58 +03:00
Aevann 3842d026f1 minor fix to chat count 2023-09-09 03:01:33 +03:00
Aevann 739ad9a2ac fix broken buttons 2023-09-08 23:03:45 +03:00