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

541 Commits (c21c7edaa163552eea4c8c9ead30090bdef6eb72)

Author SHA1 Message Date
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02: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 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +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 393fbf075d decrease padding-top by 0.1px 2022-09-03 21:52:46 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00
Aevann1 0839077838 fix pup mask 2022-09-03 04:48:27 +02:00
Aevann1 8f5e4c3ec6 add .hat class for easier blocking 2022-09-03 03:52:54 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 567c772b11 add sidebar button for tabletcels 2022-09-02 19:54:01 +02:00
Aevann1 9bc075193f increase margin after "users in chat" 2022-08-30 13:45:59 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 ac98f54902 remove .can_gamble 2022-08-26 23:00:17 +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 771b143372 restore feather icon 2022-08-24 23:58:39 +02:00
Aevann1 d34fab95b7 add "create post" button to mobile 2022-08-24 23:11:54 +02:00
Aevann1 521dd8886c add "users in chat right now" to hamburger menu 2022-08-23 20:36:02 +02:00
Aevann1 b7b7036b08 trying to fix an annoying bug 2022-08-20 14:28:14 +02:00
Aevann1 a39c4b6b72 change chat default back to 0 2022-08-19 15:04:52 +02:00
Aevann1 d4435a2a27 lazy loading for hats 2022-08-18 22:29:00 +02:00
Aevann1 2d2bbd63f9 allow ppl to middle-mouse-click on their profile on the header to open it 2022-08-18 22:18:23 +02:00
Aevann1 05ad24b500 fix 2022-08-18 16:12:09 +02:00
Aevann1 101abb55eb normalize "people here now" 2022-08-18 16:11:26 +02:00
Aevann1 395769d70d remove marseylowpoly from header (235KB) 2022-08-18 12:53:48 +02:00
Aevann1 1d7b19f485 make "before" and "after" human-readable 2022-08-17 21:09:15 +02:00
Aevann1 f52c20202f change chat default to 1 2022-08-16 18:19:44 +02:00
Aevann1 39da83e913 pretty prev commit up 2022-08-14 05:52:36 +02:00
Aevann1 a817fc35c0 show online on chat in dropdown menu 2022-08-14 05:51:25 +02:00
Aevann1 ad9cdceab4 pretty up chat count 2022-08-14 05:46:00 +02:00
Aevann1 10b23be5d2 add an id to the chat count 2022-08-14 02:26:48 +02:00
Aevann1 edc44c62b4 fix forgotten " 2022-08-13 11:59:33 +02:00
Aevann1 aea7e91b60 cosmetic changes to chat 2022-08-13 11:58:57 +02:00
Aevann1 6fe4a39908 finish the chat count commit 2022-08-13 09:45:57 +02:00
Aevann1 a51a2d2a1b remove unnecessary ending backslash from href values 2022-08-13 09:42:19 +02:00
Aevann1 9557553508 add chat users-online counter to chat icon on desktop header 2022-08-13 09:42:06 +02:00
Aevann1 d4f996a5a6 shorten too long flavor phrases for visitors 2022-08-13 04:45:31 +02:00
Aevann1 ea2f66145a add id to hole name in header 2022-08-11 18:47:43 +02: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 45fb2de7e5 delete too long visitor flavor text 2022-08-11 06:30:36 +02:00
Snakes 4fddb88c1a Hide Android app menu on sites without app. 2022-08-07 02:57:30 -04:00
Aevann1 f1232b9d04 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-06 21:15:18 +02:00
Aevann1 928351fec3 increase chance of visitors displaying 2022-08-06 21:15:16 +02:00
Snakes 997cb2df89
rDrama: restore non-Juggalo site styling. 2022-08-06 11:45:53 -04:00
Aevann1 c1d99ecef3 restore the black classes in header 2022-08-06 01:12:22 +02:00